From 195a6e032f45598837e6e976ff2da724570cd45e Mon Sep 17 00:00:00 2001
From: fmenezes <1765216+fmenezes@users.noreply.github.com>
Date: Fri, 28 Mar 2025 05:35:24 +0000
Subject: [PATCH] CLOUDP-308469: Update Test Snapshots

---
 ...513a8c5fb6d_clusters_accessLogs-677_1.json | 59 -------------------
 ...513a8c5fb6d_clusters_accessLogs-677_2.json | 59 -------------------
 ...c48ea34d0c2_clusters_accessLogs-597_1.json | 59 +++++++++++++++++++
 ...c48ea34d0c2_clusters_accessLogs-597_2.json | 59 +++++++++++++++++++
 ...ea34d0c2_clusters_provider_regions_1.json} | 10 ++--
 ...essHistory_clusters_accessLogs-597_1.json} |  8 +--
 ...-shard-00-00.aeaso.mongodb-dev.net_1.json} |  8 +--
 ...67e62e867062fc48ea34d0c2_processes_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d61adba6513a8c5fb6d_clusters_1.json | 59 -------------------
 ...s_67e62e867062fc48ea34d0c2_clusters_1.json | 59 +++++++++++++++++++
 .../e2e/.snapshots/TestAccessLogs/memory.json |  2 +-
 ...b_invites_67e62e8d7062fc48ea34d307_1.json} |  8 +--
 ...s_67e62e8b7062fc48ea34d21b_invites_1.json} | 12 ++--
 ...b_invites_67e62e8d7062fc48ea34d307_1.json} | 12 ++--
 ...s_67e62e8b7062fc48ea34d21b_invites_1.json} | 10 ++--
 ...b_invites_67e62e8d7062fc48ea34d307_1.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e62e8b7062fc48ea34d21b_invites_1.json} | 12 ++--
 .../TestAtlasProjectInvitations/memory.json   |  2 +-
 ..._clusters_AutogeneratedCommands-829_1.json | 59 -------------------
 ..._clusters_AutogeneratedCommands-829_2.json | 59 -------------------
 ..._clusters_AutogeneratedCommands-829_3.json | 53 -----------------
 ..._clusters_AutogeneratedCommands-261_1.json | 59 +++++++++++++++++++
 ..._clusters_AutogeneratedCommands-261_2.json | 59 +++++++++++++++++++
 ..._clusters_AutogeneratedCommands-261_3.json | 53 +++++++++++++++++
 ...063f1508_clusters_provider_regions_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e42d5badba6513a8c5f7bf_clusters_1.json | 59 -------------------
 ...s_67e62ec158616125063f1508_clusters_1.json | 59 +++++++++++++++++++
 .../TestAutogeneratedCommands/memory.json     |  2 +-
 ...125063f0ec0_backupCompliancePolicy_1.json} | 10 ++--
 ...125063f0ec0_backupCompliancePolicy_2.json} | 10 ++--
 ...125063f0ec0_backupCompliancePolicy_3.json} | 12 ++--
 ...125063f0ec0_backupCompliancePolicy_4.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...125063f0ec0_backupCompliancePolicy_1.json} | 10 ++--
 ...125063f0ec0_backupCompliancePolicy_2.json} | 10 ++--
 ...125063f0ec0_backupCompliancePolicy_3.json} | 10 ++--
 ...125063f114b_backupCompliancePolicy_1.json} | 12 ++--
 ...125063f114b_backupCompliancePolicy_2.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...125063f114b_backupCompliancePolicy_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...c48ea34d49a_backupCompliancePolicy_1.json} | 10 ++--
 ...2776f7a74f25_backupCompliancePolicy_1.json | 53 -----------------
 ...2776f7a74f25_backupCompliancePolicy_2.json | 53 -----------------
 ...fc48ea34d50d_backupCompliancePolicy_1.json | 53 +++++++++++++++++
 ...fc48ea34d50d_backupCompliancePolicy_2.json | 53 +++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...c48ea34d50d_backupCompliancePolicy_1.json} | 10 ++--
 ...c48ea34d50d_backupCompliancePolicy_2.json} | 10 ++--
 ...c48ea34d5c8_backupCompliancePolicy_1.json} | 10 ++--
 ...c48ea34d5c8_backupCompliancePolicy_2.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...c48ea34d5c8_backupCompliancePolicy_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...125063f12ba_backupCompliancePolicy_1.json} | 10 ++--
 ...16125063f0d2e_clusters_cluster-417_1.json} |  8 +--
 ...5f8a80c9a828500_clusters_cluster-15_1.json | 59 -------------------
 ...5f8a80c9a828500_clusters_cluster-15_2.json | 59 -------------------
 ...5f8a80c9a828500_clusters_cluster-15_3.json | 59 -------------------
 ...616125063f0d2e_clusters_cluster-417_1.json | 59 +++++++++++++++++++
 ...616125063f0d2e_clusters_cluster-417_2.json | 59 +++++++++++++++++++
 ...616125063f0d2e_clusters_cluster-417_3.json | 59 +++++++++++++++++++
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...5f8a80c9a828500_clusters_cluster-15_1.json | 53 -----------------
 ...616125063f0d2e_clusters_cluster-417_1.json | 53 +++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e42d4d15f8a80c9a828500_clusters_1.json | 59 -------------------
 ...s_67e62e8458616125063f0d2e_clusters_1.json | 59 +++++++++++++++++++
 ...63f0d2e_clusters_cluster-417_index_1.json} |  8 +--
 .../.snapshots/TestClustersFile/memory.json   |  2 +-
 ...062fc48ea34ce73_clusters_cluster-2_1.json} |  8 +--
 ...ba6513a8c60321_clusters_cluster-207_1.json | 59 -------------------
 ...ba6513a8c60321_clusters_cluster-207_2.json | 59 -------------------
 ...7062fc48ea34ce73_clusters_cluster-2_1.json | 59 +++++++++++++++++++
 ...7062fc48ea34ce73_clusters_cluster-2_2.json | 59 +++++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d95adba6513a8c60321_clusters_1.json | 59 -------------------
 ...s_67e62e7f7062fc48ea34ce73_clusters_1.json | 59 +++++++++++++++++++
 .../TestClustersM0Flags/memory.json           |  2 +-
 ...Federation_e2e-data-federation-676_1.json} |  8 +--
 ...Federation_e2e-data-federation-676_2.json} | 10 ++--
 ...a6aea3f2ed2e7dd6ce05_dataFederation_1.json | 10 ++--
 ...Federation_e2e-data-federation-676_1.json} | 12 ++--
 ...e-data-federation-676_queryLogs.gz_1.json} | 10 ++--
 ...Federation_e2e-data-federation-676_1.json} | 10 ++--
 ...a6aea3f2ed2e7dd6ce05_dataFederation_1.json | 10 ++--
 .../.snapshots/TestDataFederation/memory.json |  2 +-
 ...endpointIds_vpce-0fcd9d80bbafe7186_1.json} |  8 +--
 ...privateNetworkSettings_endpointIds_1.json} | 10 ++--
 ...endpointIds_vpce-0fcd9d80bbafe7186_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...privateNetworkSettings_endpointIds_1.json} | 12 ++--
 .../memory.json                               |  2 +-
 ...Federation_e2e-data-federation-573_1.json} |  8 +--
 ...on-573_limits_bytesProcessed.query_1.json} |  8 +--
 ...ion_e2e-data-federation-573_limits_1.json} | 10 ++--
 ...on-573_limits_bytesProcessed.query_1.json} | 10 ++--
 ...on-573_limits_bytesProcessed.query_1.json} | 10 ++--
 ...a6aea3f2ed2e7dd6ce05_dataFederation_1.json |  8 +--
 .../TestDataFederationQueryLimit/memory.json  |  2 +-
 ...rtBuckets_67e62e8458616125063f0dc4_1.json} |  8 +--
 ...f2ed2e7dd6ce05_backup_exportBuckets_1.json |  8 +--
 ...rtBuckets_67e62e8458616125063f0dc4_1.json} | 10 ++--
 ...f2ed2e7dd6ce05_backup_exportBuckets_1.json |  8 +--
 ...2ed2e7dd6ce05_clusters_cluster-264_1.json} |  8 +--
 ...snapshots_67e6304e58616125063f24df_1.json} |  8 +--
 ...f2ed2e7dd6ce05_clusters_cluster-264_1.json | 59 +++++++++++++++++++
 ...f2ed2e7dd6ce05_clusters_cluster-264_2.json | 59 +++++++++++++++++++
 ...f2ed2e7dd6ce05_clusters_cluster-264_3.json | 59 +++++++++++++++++++
 ...2ed2e7dd6ce05_clusters_cluster-264_4.json} | 10 ++--
 ...lusters_cluster-264_backup_exports_1.json} | 12 ++--
 ...p_exports_67e630f458616125063f2b36_1.json} | 12 ++--
 ...p_exports_67e630f458616125063f2b36_2.json} | 10 ++--
 ...p_exports_67e630f458616125063f2b36_3.json} | 12 ++--
 ...snapshots_67e6304e58616125063f24df_1.json} | 10 ++--
 ...snapshots_67e6304e58616125063f24df_2.json} | 12 ++--
 ...snapshots_67e6304e58616125063f24df_3.json} | 12 ++--
 ...snapshots_67e6304e58616125063f24df_4.json} | 10 ++--
 ...snapshots_67e6304e58616125063f24df_5.json} | 10 ++--
 ...f2ed2e7dd6ce05_clusters_cluster-874_1.json | 59 -------------------
 ...f2ed2e7dd6ce05_clusters_cluster-874_2.json | 59 -------------------
 ...f2ed2e7dd6ce05_clusters_cluster-874_3.json | 59 -------------------
 ...snapshots_67e6304e58616125063f24df_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...f2ed2e7dd6ce05_backup_exportBuckets_1.json | 10 ++--
 ...s_5efda6aea3f2ed2e7dd6ce05_clusters_1.json | 10 ++--
 ...lusters_cluster-264_backup_exports_1.json} | 12 ++--
 ...sters_cluster-264_backup_snapshots_1.json} |  8 +--
 .../e2e/.snapshots/TestExportJobs/memory.json |  2 +-
 ...2ed2e7dd6ce05_clusters_cluster-129_1.json} | 10 ++--
 ...e7dd6ce05_flexClusters_cluster-129_1.json} |  8 +--
 ...2ed2e7dd6ce05_clusters_cluster-129_1.json} | 10 ++--
 ..._clusters_doNotDeleteUsedForE2ETest_1.json |  6 +-
 ..._clusters_doNotDeleteUsedForE2ETest_2.json |  6 +-
 ...e7dd6ce05_flexClusters_cluster-129_1.json} | 10 ++--
 ...e7dd6ce05_flexClusters_cluster-129_2.json} | 10 ++--
 ...e7dd6ce05_flexClusters_cluster-129_3.json} | 12 ++--
 ...e7dd6ce05_flexClusters_cluster-129_4.json} | 10 ++--
 ...teUsedForE2ETest_backup_restoreJobs_1.json |  8 +--
 ...estoreJobs_67e42d70adba6513a8c5fea0_3.json | 53 -----------------
 ...estoreJobs_67e42db0adba6513a8c60784_3.json | 53 -----------------
 ...storeJobs_67e62ea558616125063f1294_1.json} | 10 ++--
 ...storeJobs_67e62ea558616125063f1294_2.json} | 12 ++--
 ...estoreJobs_67e62ea558616125063f1294_3.json | 53 +++++++++++++++++
 ...estoreJobs_67e62ea558616125063f1294_4.json | 53 +++++++++++++++++
 ...storeJobs_67e62ee77062fc48ea34d9e4_1.json} | 12 ++--
 ...storeJobs_67e62ee77062fc48ea34d9e4_2.json} | 10 ++--
 ...storeJobs_67e62ee77062fc48ea34d9e4_3.json} | 10 ++--
 ...leteUsedForE2ETest_backup_snapshots_1.json | 10 ++--
 ...snapshots_67dc4b01159cdc679dc51956_1.json} | 12 ++--
 ...fda6aea3f2ed2e7dd6ce05_flexClusters_1.json |  8 +--
 ...teUsedForE2ETest_backup_restoreJobs_1.json |  8 +--
 ...teUsedForE2ETest_backup_restoreJobs_2.json | 10 ++--
 .../e2e/.snapshots/TestFlexBackup/memory.json |  2 +-
 ...2ed2e7dd6ce05_clusters_cluster-419_1.json} | 12 ++--
 ...e7dd6ce05_flexClusters_cluster-419_1.json} |  8 +--
 ...2ed2e7dd6ce05_clusters_cluster-419_1.json} | 12 ++--
 ...fda6aea3f2ed2e7dd6ce05_flexClusters_1.json | 10 ++--
 ...e7dd6ce05_flexClusters_cluster-419_1.json} | 12 ++--
 ...e7dd6ce05_flexClusters_cluster-419_2.json} | 12 ++--
 ...e7dd6ce05_flexClusters_cluster-419_3.json} | 12 ++--
 ...fda6aea3f2ed2e7dd6ce05_flexClusters_1.json | 10 ++--
 .../.snapshots/TestFlexCluster/memory.json    |  2 +-
 ...2ed2e7dd6ce05_clusters_cluster-831_1.json} | 12 ++--
 ...e7dd6ce05_flexClusters_cluster-831_1.json} |  8 +--
 ...e7dd6ce05_flexClusters_cluster-831_1.json} | 10 ++--
 ...e7dd6ce05_flexClusters_cluster-831_2.json} | 12 ++--
 ...fda6aea3f2ed2e7dd6ce05_flexClusters_1.json | 10 ++--
 .../TestFlexClustersFile/memory.json          |  2 +-
 ..._userSecurity_ldap_userToDNMapping_1.json} |  8 +--
 ...3adba6513a8c5f598_clusters_ldap-395_1.json | 59 -------------------
 ...3adba6513a8c5f598_clusters_ldap-395_2.json | 59 -------------------
 ...3a8c5f598_clusters_provider_regions_1.json | 53 -----------------
 ...07062fc48ea34ceda_clusters_ldap-704_1.json | 59 +++++++++++++++++++
 ...07062fc48ea34ceda_clusters_ldap-704_2.json | 59 +++++++++++++++++++
 ...ea34ceda_clusters_provider_regions_1.json} | 10 ++--
 ...62e807062fc48ea34ceda_userSecurity_1.json} |  8 +--
 ...ap_verify_67e6307358616125063f2678_1.json} | 12 ++--
 ...ap_verify_67e6307358616125063f2678_2.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...62e807062fc48ea34ceda_userSecurity_1.json} |  8 +--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d53adba6513a8c5f598_clusters_1.json | 59 -------------------
 ...s_67e62e807062fc48ea34ceda_clusters_1.json | 59 +++++++++++++++++++
 ...8ea34ceda_userSecurity_ldap_verify_1.json} | 12 ++--
 .../.snapshots/TestLDAPWithFlags/memory.json  |  2 +-
 ..._userSecurity_ldap_userToDNMapping_1.json} |  8 +--
 ...2e977b2776f7a77ec8_clusters_ldap-87_1.json | 59 -------------------
 ...2e977b2776f7a77ec8_clusters_ldap-87_2.json | 59 -------------------
 ...97062fc48ea34e810_clusters_ldap-311_1.json | 59 +++++++++++++++++++
 ...97062fc48ea34e810_clusters_ldap-311_2.json | 59 +++++++++++++++++++
 ...ea34e810_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...630797062fc48ea34e810_userSecurity_1.json} |  8 +--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e42f2e977b2776f7a77ec8_clusters_1.json | 59 -------------------
 ...s_67e630797062fc48ea34e810_clusters_1.json | 59 +++++++++++++++++++
 ...8ea34e810_userSecurity_ldap_verify_1.json} | 12 ++--
 .../.snapshots/TestLDAPWithStdin/memory.json  |  2 +-
 ...e7dd6cde4_liveMigrations_linkTokens_1.json |  6 +-
 ...e7dd6cde4_liveMigrations_linkTokens_2.json |  6 +-
 ...e7dd6cde4_liveMigrations_linkTokens_1.json | 10 ++--
 ...2977b2776f7a786d1_clusters_logs-282_1.json | 59 -------------------
 ...2977b2776f7a786d1_clusters_logs-282_2.json | 59 -------------------
 ...-dev.net_logs_mongodb-audit-log.gz_1.json} | 10 ++--
 ...ul.mongodb-dev.net_logs_mongodb.gz_1.json} | 10 ++--
 ...ul.mongodb-dev.net_logs_mongodb.gz_2.json} | 10 ++--
 ...b-dev.net_logs_mongos-audit-log.gz_1.json} | 10 ++--
 ...uul.mongodb-dev.net_logs_mongos.gz_1.json} | 10 ++--
 ...658616125063f2783_clusters_logs-447_1.json | 59 +++++++++++++++++++
 ...658616125063f2783_clusters_logs-447_2.json | 59 +++++++++++++++++++
 ...063f2783_clusters_provider_regions_1.json} | 10 ++--
 ...67e6308658616125063f2783_processes_1.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../TestLogs/POST__api_atlas_v2_groups_1.json |  8 +--
 ...s_67e42fc2977b2776f7a786d1_clusters_1.json | 59 -------------------
 ...s_67e6308658616125063f2783_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestLogs/memory.json      |  2 +-
 ...ba6513a8c603b7_clusters_metrics-580_1.json | 59 -------------------
 ...ba6513a8c603b7_clusters_metrics-580_2.json | 59 -------------------
 ...v.net_27017_disks_data_measurements_1.json | 56 ------------------
 ....mongodb-dev.net_27017_measurements_1.json | 53 -----------------
 ...62fc48ea34d34f_clusters_metrics-513_1.json | 59 +++++++++++++++++++
 ...62fc48ea34d34f_clusters_metrics-513_2.json | 59 +++++++++++++++++++
 ...8ea34d34f_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...67e62e8f7062fc48ea34d34f_processes_1.json} | 12 ++--
 ...rf.mongodb-dev.net_27017_databases_1.json} | 12 ++--
 ...7017_databases_config_measurements_1.json} | 10 ++--
 ....vawrf.mongodb-dev.net_27017_disks_1.json} | 12 ++--
 ...v.net_27017_disks_data_measurements_1.json | 56 ++++++++++++++++++
 ....mongodb-dev.net_27017_measurements_1.json | 53 +++++++++++++++++
 ...mongodb-dev.net_27017_measurements_2.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e42d96adba6513a8c603b7_clusters_1.json | 59 -------------------
 ...s_67e62e8f7062fc48ea34d34f_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestMetrics/memory.json   |  2 +-
 ...eArchives_67e630af7062fc48ea34eabf_1.json} |  8 +--
 ...8c5f96f_clusters_onlineArchives-583_1.json | 59 -------------------
 ...8c5f96f_clusters_onlineArchives-583_2.json | 59 -------------------
 ...63f0e14_clusters_onlineArchives-561_1.json | 59 +++++++++++++++++++
 ...63f0e14_clusters_onlineArchives-561_2.json | 59 +++++++++++++++++++
 ..._onlineArchives-561_onlineArchives_1.json} | 12 ++--
 ...eArchives_67e630af7062fc48ea34eabf_1.json} | 12 ++--
 ...eArchives_67e630af7062fc48ea34eabf_2.json} | 10 ++--
 ...5063f0e14_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...eArchives_67e630af7062fc48ea34eabf_1.json} |  8 +--
 ...eArchives_67e630af7062fc48ea34eabf_2.json} |  8 +--
 ...eArchives_67e630af7062fc48ea34eabf_3.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e42d5cadba6513a8c5f96f_clusters_1.json | 59 -------------------
 ...s_67e62e8658616125063f0e14_clusters_1.json | 59 +++++++++++++++++++
 ..._onlineArchives-561_onlineArchives_1.json} | 12 ++--
 .../.snapshots/TestOnlineArchives/memory.json |  2 +-
 ...6125063f0f6c_managedSlowMs_disable_1.json} |  8 +--
 ...743_clusters_performanceAdvisor-837_1.json | 59 -------------------
 ...743_clusters_performanceAdvisor-837_2.json | 59 -------------------
 ..._67e42d96977b2776f7a75743_processes_1.json | 53 -----------------
 ...0f6c_clusters_performanceAdvisor-82_1.json | 59 +++++++++++++++++++
 ...0f6c_clusters_performanceAdvisor-82_2.json | 59 +++++++++++++++++++
 ...5063f0f6c_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ..._67e62e8b58616125063f0f6c_processes_1.json | 53 +++++++++++++++++
 ...7017_performanceAdvisor_namespaces_1.json} |  8 +--
 ...7_performanceAdvisor_slowQueryLogs_1.json} |  8 +--
 ...erformanceAdvisor_suggestedIndexes_1.json} |  8 +--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d96977b2776f7a75743_clusters_1.json | 59 -------------------
 ...s_67e62e8b58616125063f0f6c_clusters_1.json | 59 +++++++++++++++++++
 ...16125063f0f6c_managedSlowMs_enable_1.json} |  8 +--
 .../TestPerformanceAdvisor/memory.json        |  2 +-
 ...ntService_67e62e947062fc48ea34d45d_1.json} |  8 +--
 ...rivateEndpoint_AWS_endpointService_1.json} | 12 ++--
 ...ntService_67e62e947062fc48ea34d45d_1.json} | 12 ++--
 ...ntService_67e62e947062fc48ea34d45d_2.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...e7_privateEndpoint_endpointService_1.json} | 12 ++--
 .../TestPrivateEndpointsAWS/memory.json       |  2 +-
 ...ntService_67e62f397062fc48ea34dcd1_1.json} |  8 +--
 ...vateEndpoint_AZURE_endpointService_1.json} | 10 ++--
 ...ntService_67e62f397062fc48ea34dcd1_1.json} | 10 ++--
 ...ntService_67e62f397062fc48ea34dcd1_2.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...6f_privateEndpoint_endpointService_1.json} | 10 ++--
 ...ntService_67e62f727062fc48ea34dee9_1.json} |  8 +--
 ...intService_67e42e52adba6513a8c6174a_2.json | 53 -----------------
 ...intService_67e42e52adba6513a8c6174a_3.json | 53 -----------------
 ...intService_67e42e52adba6513a8c6174a_4.json | 53 -----------------
 ...rivateEndpoint_GCP_endpointService_1.json} | 12 ++--
 ...ntService_67e62f727062fc48ea34dee9_1.json} | 12 ++--
 ...intService_67e62f727062fc48ea34dee9_2.json | 53 +++++++++++++++++
 ...intService_67e62f727062fc48ea34dee9_3.json | 53 +++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...6b_privateEndpoint_endpointService_1.json} | 12 ++--
 .../TestPrivateEndpointsGCP/memory.json       |  2 +-
 ...6513a8c5fad7_clusters_processes-695_1.json | 59 -------------------
 ...6513a8c5fad7_clusters_processes-695_2.json | 59 -------------------
 ...3a8c5fad7_clusters_provider_regions_1.json | 53 -----------------
 ...6125063f0bc6_clusters_processes-244_1.json | 59 +++++++++++++++++++
 ...6125063f0bc6_clusters_processes-244_2.json | 59 +++++++++++++++++++
 ...5063f0bc6_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...67e62e7858616125063f0bc6_processes_1.json} | 12 ++--
 ...-00-00.3x5fr.mongodb-dev.net_27017_1.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d5fadba6513a8c5fad7_clusters_1.json | 59 -------------------
 ...s_67e62e7858616125063f0bc6_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestProcesses/memory.json |  2 +-
 ...f2558_privateEndpoint_regionalMode_1.json} |  8 +--
 ...f2558_privateEndpoint_regionalMode_1.json} |  8 +--
 ...f2558_privateEndpoint_regionalMode_2.json} |  8 +--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...snapshots_67e632777062fc48ea34f6ee_1.json} |  8 +--
 ...8c5f72f_clusters_backupRestores-212_1.json | 59 -------------------
 ...8c5f72f_clusters_backupRestores-212_2.json | 59 -------------------
 ...8c5f72f_clusters_backupRestores-212_3.json | 59 -------------------
 ...8c5f72f_clusters_backupRestores-212_4.json | 59 -------------------
 ..._snapshots_67e43128977b2776f7a796ae_4.json | 53 -----------------
 ..._snapshots_67e43128977b2776f7a796ae_5.json | 53 -----------------
 ...8c624e9_clusters_backupRestores2-73_1.json | 59 -------------------
 ...8c624e9_clusters_backupRestores2-73_2.json | 59 -------------------
 ...3a8c624e9_clusters_provider_regions_1.json | 53 -----------------
 ...a34d22e_clusters_backupRestores-539_1.json | 59 +++++++++++++++++++
 ...a34d22e_clusters_backupRestores-539_2.json | 59 +++++++++++++++++++
 ...a34d22e_clusters_backupRestores-539_3.json | 59 +++++++++++++++++++
 ...a34d22e_clusters_backupRestores-539_4.json | 59 +++++++++++++++++++
 ...kupRestores-539_backup_restoreJobs_1.json} | 10 ++--
 ...storeJobs_67e6335a7062fc48ea34fbc7_1.json} | 12 ++--
 ...storeJobs_67e6335a7062fc48ea34fbc7_2.json} | 10 ++--
 ...storeJobs_67e6335a7062fc48ea34fbc7_3.json} | 10 ++--
 ...storeJobs_67e6344458616125063f41e0_1.json} | 12 ++--
 ...storeJobs_67e6344458616125063f41e0_2.json} | 12 ++--
 ..._snapshots_67e632777062fc48ea34f6ee_1.json | 53 +++++++++++++++++
 ..._snapshots_67e632777062fc48ea34f6ee_2.json | 53 +++++++++++++++++
 ...snapshots_67e632777062fc48ea34f6ee_3.json} | 12 ++--
 ...snapshots_67e632777062fc48ea34f6ee_4.json} | 12 ++--
 ...snapshots_67e632777062fc48ea34f6ee_5.json} | 12 ++--
 ...ea34d22e_clusters_provider_regions_1.json} | 10 ++--
 ...kupRestores-539_backup_restoreJobs_1.json} | 10 ++--
 ...storeJobs_67e6335a7062fc48ea34fbc7_1.json} | 10 ++--
 ...storeJobs_67e6335a7062fc48ea34fbc7_2.json} | 10 ++--
 ...storeJobs_67e6344458616125063f41e0_1.json} | 10 ++--
 ...snapshots_67e632777062fc48ea34f6ee_1.json} | 10 ++--
 ...3f2692_clusters_backupRestores2-604_1.json | 59 +++++++++++++++++++
 ...3f2692_clusters_backupRestores2-604_2.json | 59 +++++++++++++++++++
 ...063f2692_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 .../POST__api_atlas_v2_groups_2.json          | 10 ++--
 ...s_67e42d57adba6513a8c5f72f_clusters_1.json | 59 -------------------
 ...s_67e42f21adba6513a8c624e9_clusters_1.json | 59 -------------------
 ...s_67e62e8b7062fc48ea34d22e_clusters_1.json | 59 +++++++++++++++++++
 ...kupRestores-539_backup_restoreJobs_1.json} | 12 ++--
 ...kupRestores-539_backup_restoreJobs_2.json} | 12 ++--
 ...ackupRestores-539_backup_snapshots_1.json} | 12 ++--
 ...s_67e6307658616125063f2692_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestRestores/memory.json  |  2 +-
 ...backupSchedule-915_backup_schedule_1.json} | 12 ++--
 ...8c5f6ae_clusters_backupSchedule-982_1.json | 59 -------------------
 ...8c5f6ae_clusters_backupSchedule-982_2.json | 59 -------------------
 ...63f0d23_clusters_backupSchedule-915_1.json | 59 +++++++++++++++++++
 ...63f0d23_clusters_backupSchedule-915_2.json | 59 +++++++++++++++++++
 ...backupSchedule-915_backup_schedule_1.json} | 10 ++--
 ...063f0d23_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...backupSchedule-915_backup_schedule_1.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d56adba6513a8c5f6ae_clusters_1.json | 59 -------------------
 ...s_67e62e8458616125063f0d23_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestSchedule/memory.json  |  2 +-
 ...s_indexes_67e630a47062fc48ea34e9ec_1.json} |  8 +--
 ...3a8c5f8e8_clusters_provider_regions_1.json | 53 -----------------
 ...adba6513a8c5f8e8_clusters_search-78_1.json | 59 -------------------
 ...adba6513a8c5f8e8_clusters_search-78_2.json | 59 -------------------
 ...ea34cf7e_clusters_provider_regions_1.json} | 10 ++--
 ...062fc48ea34cf7e_clusters_search-926_1.json | 59 +++++++++++++++++++
 ...062fc48ea34cf7e_clusters_search-926_2.json | 59 +++++++++++++++++++
 ...s_indexes_67e630a47062fc48ea34e9ec_1.json} | 12 ++--
 ...26_fts_indexes_sample_mflix_movies_1.json} | 10 ++--
 ...tasetLoad_67e6306658616125063f2609_1.json} | 10 ++--
 ...tasetLoad_67e6306658616125063f2609_2.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...h_indexes_67e630a47062fc48ea34e9ec_1.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e42d5cadba6513a8c5f8e8_clusters_1.json | 59 -------------------
 ...s_67e62e847062fc48ea34cf7e_clusters_1.json | 59 +++++++++++++++++++
 ...7e_clusters_search-926_fts_indexes_1.json} | 12 ++--
 ...clusters_search-926_search_indexes_1.json} | 12 ++--
 ...clusters_search-926_search_indexes_2.json} | 10 ++--
 ...clusters_search-926_search_indexes_3.json} | 10 ++--
 ...4cf7e_sampleDatasetLoad_search-926_1.json} | 10 ++--
 test/e2e/.snapshots/TestSearch/memory.json    |  2 +-
 ...s_indexes_67e632c17062fc48ea34f86f_1.json} |  8 +--
 ...6f7a78381_clusters_provider_regions_1.json | 53 -----------------
 ...77b2776f7a78381_clusters_search-811_1.json | 59 -------------------
 ...77b2776f7a78381_clusters_search-811_2.json | 59 -------------------
 ...ea34ea50_clusters_provider_regions_1.json} |  8 +--
 ...7062fc48ea34ea50_clusters_search-90_1.json | 59 +++++++++++++++++++
 ...7062fc48ea34ea50_clusters_search-90_2.json | 59 +++++++++++++++++++
 ...s_indexes_67e632c17062fc48ea34f86f_1.json} | 12 ++--
 ...90_fts_indexes_sample_mflix_movies_1.json} |  8 +--
 ...tasetLoad_67e6328b7062fc48ea34f758_1.json} | 12 ++--
 ...tasetLoad_67e6328b7062fc48ea34f758_2.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...s_indexes_67e632c17062fc48ea34f86f_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42f94977b2776f7a78381_clusters_1.json | 59 -------------------
 ...s_67e630ad7062fc48ea34ea50_clusters_1.json | 59 +++++++++++++++++++
 ...a50_clusters_search-90_fts_indexes_1.json} | 12 ++--
 ...a50_clusters_search-90_fts_indexes_2.json} | 12 ++--
 ...a50_clusters_search-90_fts_indexes_3.json} | 12 ++--
 ...a50_clusters_search-90_fts_indexes_4.json} | 12 ++--
 ...34ea50_sampleDatasetLoad_search-90_1.json} | 12 ++--
 .../TestSearchDeprecated/memory.json          |  2 +-
 ...c48ea34d05f_serverless_cluster-548_1.json} |  8 +--
 ...67e42d63adba6513a8c5fc6c_serverless_1.json | 53 -----------------
 ...67e62e857062fc48ea34d05f_serverless_1.json | 53 +++++++++++++++++
 ...c48ea34d05f_serverless_cluster-548_1.json} | 12 ++--
 ...c48ea34d05f_serverless_cluster-548_2.json} | 12 ++--
 ...c48ea34d05f_serverless_cluster-548_3.json} | 12 ++--
 ...a6513a8c5fc6c_serverless_cluster-74_1.json | 47 ---------------
 ...fc48ea34d05f_serverless_cluster-548_1.json | 47 +++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...7e62e857062fc48ea34d05f_serverless_1.json} | 12 ++--
 .../e2e/.snapshots/TestServerless/memory.json |  2 +-
 ...2fc48ea34cfeb_clusters_cluster-970_1.json} |  8 +--
 ...6f7a74f3b_clusters_provider_regions_1.json | 53 -----------------
 ...8ea34cfeb_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d5d977b2776f7a74f3b_clusters_1.json | 59 -------------------
 ...s_67e62e857062fc48ea34cfeb_clusters_1.json | 59 +++++++++++++++++++
 .../.snapshots/TestShardedCluster/memory.json |  2 +-
 ...f8a80c9a82856b_clusters_cluster-436_1.json | 53 -----------------
 ...616125063f0cab_clusters_cluster-797_1.json | 53 +++++++++++++++++
 ...f8a80c9a82856b_clusters_cluster-436_1.json | 59 -------------------
 ...f8a80c9a82856b_clusters_cluster-436_2.json | 59 -------------------
 ...f8a80c9a82856b_clusters_cluster-436_3.json | 59 -------------------
 ...f8a80c9a82856b_clusters_cluster-436_4.json | 59 -------------------
 ...f8a80c9a82856b_clusters_cluster-436_5.json | 59 -------------------
 ...f8a80c9a82856b_clusters_cluster-436_6.json | 59 -------------------
 ...f8a80c9a82856b_clusters_cluster-436_7.json | 59 -------------------
 ...f8a80c9a82856b_clusters_cluster-436_8.json | 59 -------------------
 ...616125063f0cab_clusters_cluster-797_1.json | 59 +++++++++++++++++++
 ...616125063f0cab_clusters_cluster-797_2.json | 59 +++++++++++++++++++
 ...616125063f0cab_clusters_cluster-797_3.json | 59 +++++++++++++++++++
 ...616125063f0cab_clusters_cluster-797_4.json | 59 +++++++++++++++++++
 ...616125063f0cab_clusters_cluster-797_5.json | 59 +++++++++++++++++++
 ...616125063f0cab_clusters_cluster-797_6.json | 59 +++++++++++++++++++
 ...616125063f0cab_clusters_cluster-797_7.json | 59 +++++++++++++++++++
 ...616125063f0cab_clusters_cluster-797_8.json | 59 +++++++++++++++++++
 ...616125063f0cab_clusters_cluster-797_9.json | 59 +++++++++++++++++++
 ...063f0cab_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...a80c9a82856b_clusters_tenantUpgrade_1.json | 53 -----------------
 ...6125063f0cab_clusters_tenantUpgrade_1.json | 53 +++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d4f15f8a80c9a82856b_clusters_1.json | 59 -------------------
 ...s_67e62e8358616125063f0cab_clusters_1.json | 59 +++++++++++++++++++
 .../TestSharedClusterUpgrade/memory.json      |  2 +-
 ...f2ed2e7dd6ce05_clusters_cluster-67_1.json} |  8 +--
 ...snapshots_67e630947062fc48ea34e958_1.json} |  8 +--
 ...3f2ed2e7dd6ce05_clusters_cluster-67_1.json | 59 +++++++++++++++++++
 ...3f2ed2e7dd6ce05_clusters_cluster-67_2.json | 59 +++++++++++++++++++
 ...3f2ed2e7dd6ce05_clusters_cluster-67_3.json | 59 +++++++++++++++++++
 ...f2ed2e7dd6ce05_clusters_cluster-67_4.json} | 10 ++--
 ...usters_cluster-67_backup_snapshots_1.json} | 10 ++--
 ...snapshots_67e630947062fc48ea34e958_1.json} | 10 ++--
 ...snapshots_67e630947062fc48ea34e958_2.json} | 10 ++--
 ...snapshots_67e630947062fc48ea34e958_3.json} | 10 ++--
 ..._snapshots_67e630947062fc48ea34e958_4.json | 53 +++++++++++++++++
 ..._snapshots_67e630947062fc48ea34e958_5.json | 53 +++++++++++++++++
 ..._snapshots_67e630947062fc48ea34e958_6.json | 53 +++++++++++++++++
 ...3f2ed2e7dd6ce05_clusters_cluster-91_1.json | 59 -------------------
 ...3f2ed2e7dd6ce05_clusters_cluster-91_2.json | 59 -------------------
 ...3f2ed2e7dd6ce05_clusters_cluster-91_3.json | 59 -------------------
 ..._snapshots_67e42f66977b2776f7a78197_4.json | 53 -----------------
 ..._snapshots_67e42f66977b2776f7a78197_5.json | 53 -----------------
 ..._snapshots_67e42f66977b2776f7a78197_6.json | 53 -----------------
 ...usters_cluster-67_backup_snapshots_1.json} | 10 ++--
 ...snapshots_67e630947062fc48ea34e958_1.json} | 10 ++--
 ...snapshots_67e630947062fc48ea34e958_2.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...s_5efda6aea3f2ed2e7dd6ce05_clusters_1.json | 10 ++--
 ...usters_cluster-67_backup_snapshots_1.json} | 10 ++--
 test/e2e/.snapshots/TestSnapshots/memory.json |  2 +-
 ...616125063f1039_streams_instance-28_1.json} |  8 +--
 ...ance-28_connections_connection-443_1.json} |  8 +--
 ...nnections_67e62e9158616125063f111a_1.json} |  8 +--
 ...s_67e62e8c58616125063f1039_streams_1.json} | 12 ++--
 ...s_67e62e8c58616125063f1039_streams_2.json} | 12 ++--
 ...616125063f1039_streams_instance-28_1.json} | 12 ++--
 ...1039_streams_instance-28_auditLogs_1.json} | 10 ++--
 ...39_streams_instance-28_connections_1.json} | 12 ++--
 ...ance-28_connections_connection-443_1.json} | 10 ++--
 ...039_streams_privateLinkConnections_1.json} | 12 ++--
 ...nnections_67e62e9158616125063f111a_1.json} | 12 ++--
 ...616125063f1039_streams_instance-28_1.json} | 12 ++--
 ...ance-28_connections_connection-443_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e62e8c58616125063f1039_streams_1.json} | 12 ++--
 ...39_streams_instance-28_connections_1.json} | 10 ++--
 ...039_streams_privateLinkConnections_1.json} | 12 ++--
 test/e2e/.snapshots/TestStreams/memory.json   |  2 +-
 ...2fc48ea34d6fc_streams_instance-567_1.json} |  8 +--
 ...ba6513a8c5fa65_clusters_cluster-241_1.json | 59 -------------------
 ...ba6513a8c5fa65_clusters_cluster-241_2.json | 59 -------------------
 ...62fc48ea34d6fc_clusters_cluster-489_1.json | 59 +++++++++++++++++++
 ...62fc48ea34d6fc_clusters_cluster-489_2.json | 59 +++++++++++++++++++
 ...8ea34d6fc_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d5eadba6513a8c5fa65_clusters_1.json | 59 -------------------
 ...s_67e62eb67062fc48ea34d6fc_clusters_1.json | 59 +++++++++++++++++++
 ...s_67e62eb67062fc48ea34d6fc_streams_1.json} | 10 ++--
 ...c_streams_instance-567_connections_1.json} | 10 ++--
 .../TestStreamsWithClusters/memory.json       |  2 +-
 522 files changed, 7031 insertions(+), 7025 deletions(-)
 delete mode 100644 test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_1.json
 delete mode 100644 test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_2.json
 create mode 100644 test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_accessLogs-597_1.json
 create mode 100644 test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_accessLogs-597_2.json
 rename test/e2e/.snapshots/{TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_provider_regions_1.json => TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestAccessLogs/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_clusters_accessLogs-677_1.json => GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_dbAccessHistory_clusters_accessLogs-597_1.json} (80%)
 rename test/e2e/.snapshots/TestAccessLogs/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_processes_atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net_1.json => GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_dbAccessHistory_processes_atlas-vvnyjg-shard-00-00.aeaso.mongodb-dev.net_1.json} (78%)
 rename test/e2e/.snapshots/TestAccessLogs/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_processes_1.json => GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_processes_1.json} (54%)
 delete mode 100644 test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_1.json
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{DELETE__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json => DELETE__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json} (81%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json} (68%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json} (66%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json => PATCH__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json} (61%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json => PATCH__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json} (59%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{POST__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json => POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json} (68%)
 delete mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_1.json
 delete mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_2.json
 delete mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_3.json
 create mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_1.json
 create mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_2.json
 create mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_3.json
 rename test/e2e/.snapshots/{TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_provider_regions_1.json => TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_provider_regions_1.json} (55%)
 delete mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_1.json
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json => TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_1.json} (62%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_2.json => TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_2.json} (62%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json => GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_3.json} (61%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_4.json => GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_4.json} (62%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json => PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_1.json} (76%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json => PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_2.json} (76%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json => PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_3.json} (76%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json => TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_1.json} (61%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json => TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_2.json} (62%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e42d5b977b2776f7a74e75_backupCompliancePolicy_1.json => TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_1.json} (76%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json => TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e62e997062fc48ea34d49a_backupCompliancePolicy_1.json} (76%)
 delete mode 100644 test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
 delete mode 100644 test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
 create mode 100644 test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_1.json
 create mode 100644 test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_2.json
 rename test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/{PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json => PUT__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_1.json} (75%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/{PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json => PUT__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_2.json} (75%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_2.json => TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_1.json} (62%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json => TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_2.json} (62%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json => TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_1.json} (76%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicySetup/{PUT__api_atlas_v2_groups_67e42d6badba6513a8c5fdf3_backupCompliancePolicy_1.json => PUT__api_atlas_v2_groups_67e62ea858616125063f12ba_backupCompliancePolicy_1.json} (75%)
 rename test/e2e/.snapshots/{TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json => TestClustersFile/DELETE__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_2.json
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_3.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_2.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_3.json
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_1.json
 rename test/e2e/.snapshots/TestClustersFile/{POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_index_1.json => POST__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_index_1.json} (81%)
 rename test/e2e/.snapshots/{TestClustersFile/DELETE__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json => TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
 delete mode 100644 test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_2.json
 create mode 100644 test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_2.json
 delete mode 100644 test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_1.json
 rename test/e2e/.snapshots/{TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_1.json => TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json} (85%)
 rename test/e2e/.snapshots/TestDataFederation/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_2.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_2.json} (80%)
 rename test/e2e/.snapshots/TestDataFederation/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json} (63%)
 rename test/e2e/.snapshots/TestDataFederation/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_queryLogs.gz_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_queryLogs.gz_1.json} (75%)
 rename test/e2e/.snapshots/TestDataFederation/{PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json => PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json} (80%)
 rename test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/{DELETE__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json => DELETE__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe7186_1.json} (77%)
 rename test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json => GET__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_1.json} (62%)
 rename test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json => GET__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe7186_1.json} (74%)
 rename test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/{POST__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json => POST__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_1.json} (62%)
 rename test/e2e/.snapshots/{TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json => TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_1.json} (85%)
 rename test/e2e/.snapshots/TestDataFederationQueryLimit/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json} (83%)
 rename test/e2e/.snapshots/TestDataFederationQueryLimit/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_1.json} (69%)
 rename test/e2e/.snapshots/TestDataFederationQueryLimit/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json} (71%)
 rename test/e2e/.snapshots/TestDataFederationQueryLimit/{PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json => PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json} (76%)
 rename test/e2e/.snapshots/TestExportBuckets/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e62e8458616125063f0dc4_1.json} (84%)
 rename test/e2e/.snapshots/TestExportBuckets/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e62e8458616125063f0dc4_1.json} (73%)
 rename test/e2e/.snapshots/TestExportJobs/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_1.json} (87%)
 rename test/e2e/.snapshots/TestExportJobs/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json} (83%)
 create mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_1.json
 create mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_2.json
 create mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_3.json
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_4.json} (81%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_1.json} (58%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_1.json} (64%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_3.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_2.json} (64%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_3.json} (63%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json} (61%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_2.json} (60%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_3.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_3.json} (59%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_4.json} (59%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_5.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_5.json} (58%)
 delete mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
 delete mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_2.json
 delete mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_3.json
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json} (76%)
 rename test/e2e/.snapshots/TestExportJobs/{POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json => POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_1.json} (65%)
 rename test/e2e/.snapshots/{TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json => TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_1.json} (62%)
 rename test/e2e/.snapshots/TestFlexBackup/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-129_1.json} (79%)
 rename test/e2e/.snapshots/TestFlexBackup/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_1.json} (86%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-129_1.json} (81%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_1.json} (62%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_2.json} (56%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_3.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_3.json} (55%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_4.json} (79%)
 delete mode 100644 test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_3.json
 delete mode 100644 test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_3.json
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_1.json} (62%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_2.json} (61%)
 create mode 100644 test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_3.json
 create mode 100644 test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_4.json
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_1.json} (61%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_2.json} (62%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_3.json} (61%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67d9a7e45e90d409463d0500_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67dc4b01159cdc679dc51956_1.json} (68%)
 rename test/e2e/.snapshots/TestFlexCluster/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-419_1.json} (67%)
 rename test/e2e/.snapshots/TestFlexCluster/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_1.json} (86%)
 rename test/e2e/.snapshots/TestFlexCluster/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-419_1.json} (70%)
 rename test/e2e/.snapshots/TestFlexCluster/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_1.json} (65%)
 rename test/e2e/.snapshots/{TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json => TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_2.json} (61%)
 rename test/e2e/.snapshots/{TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_2.json => TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_3.json} (65%)
 rename test/e2e/.snapshots/TestFlexClustersFile/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-16_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-831_1.json} (67%)
 rename test/e2e/.snapshots/TestFlexClustersFile/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_1.json} (86%)
 rename test/e2e/.snapshots/{TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json => TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_1.json} (62%)
 rename test/e2e/.snapshots/{TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_3.json => TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_2.json} (65%)
 rename test/e2e/.snapshots/{TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_userToDNMapping_1.json => TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_userToDNMapping_1.json} (86%)
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_1.json
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_2.json
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_ldap-704_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_ldap-704_2.json
 rename test/e2e/.snapshots/{TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_provider_regions_1.json => TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestLDAPWithFlags/{GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json => GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_1.json} (87%)
 rename test/e2e/.snapshots/TestLDAPWithFlags/{GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_1.json => GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_67e6307358616125063f2678_1.json} (59%)
 rename test/e2e/.snapshots/TestLDAPWithFlags/{GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_2.json => GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_67e6307358616125063f2678_2.json} (58%)
 rename test/e2e/.snapshots/{TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_1.json => TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_1.json} (87%)
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_1.json
 rename test/e2e/.snapshots/TestLDAPWithFlags/{POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_1.json => POST__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_1.json} (61%)
 rename test/e2e/.snapshots/{TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_userToDNMapping_1.json => TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_ldap_userToDNMapping_1.json} (86%)
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_1.json
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_2.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_ldap-311_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_ldap-311_2.json
 rename test/e2e/.snapshots/TestLDAPWithStdin/{GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_provider_regions_1.json => GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/{TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json => TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_1.json} (87%)
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_1.json
 rename test/e2e/.snapshots/TestLDAPWithStdin/{POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_verify_1.json => POST__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_ldap_verify_1.json} (61%)
 delete mode 100644 test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_1.json
 delete mode 100644 test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_2.json
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json => GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json} (67%)
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_1.json => GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb.gz_1.json} (68%)
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_2.json => GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb.gz_2.json} (68%)
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos-audit-log.gz_1.json => GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongos-audit-log.gz_1.json} (67%)
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos.gz_1.json => GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongos.gz_1.json} (68%)
 create mode 100644 test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_logs-447_1.json
 create mode 100644 test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_logs-447_2.json
 rename test/e2e/.snapshots/{TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_provider_regions_1.json => TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/{TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_1.json => TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_processes_1.json} (54%)
 delete mode 100644 test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e6308658616125063f2783_clusters_1.json
 delete mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_1.json
 delete mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_2.json
 delete mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_data_measurements_1.json
 delete mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_1.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_metrics-513_1.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_metrics-513_2.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_provider_regions_1.json
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_1.json => GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_1.json} (54%)
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_1.json => GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_databases_1.json} (59%)
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_config_measurements_1.json => GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_databases_config_measurements_1.json} (54%)
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_1.json => GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_disks_1.json} (60%)
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_disks_data_measurements_1.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_measurements_1.json
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_2.json => GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_measurements_2.json} (57%)
 delete mode 100644 test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_1.json
 rename test/e2e/.snapshots/TestOnlineArchives/{DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json => DELETE__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json} (77%)
 delete mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_1.json
 delete mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_2.json
 create mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_1.json
 create mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_2.json
 rename test/e2e/.snapshots/TestOnlineArchives/{GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json => GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_1.json} (51%)
 rename test/e2e/.snapshots/TestOnlineArchives/{GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json => GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json} (56%)
 rename test/e2e/.snapshots/TestOnlineArchives/{GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json => GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_2.json} (68%)
 create mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_provider_regions_1.json
 rename test/e2e/.snapshots/TestOnlineArchives/{PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json => PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json} (80%)
 rename test/e2e/.snapshots/TestOnlineArchives/{PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json => PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_2.json} (80%)
 rename test/e2e/.snapshots/TestOnlineArchives/{PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_3.json => PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_3.json} (74%)
 delete mode 100644 test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_1.json
 rename test/e2e/.snapshots/TestOnlineArchives/{POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json => POST__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_1.json} (57%)
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{DELETE__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_disable_1.json => DELETE__api_atlas_v2_groups_67e62e8b58616125063f0f6c_managedSlowMs_disable_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_1.json
 delete mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_2.json
 delete mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_1.json
 create mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_performanceAdvisor-82_1.json
 create mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_performanceAdvisor-82_2.json
 create mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_1.json
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json => GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json} (79%)
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json => GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json} (79%)
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json => GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json} (80%)
 delete mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_1.json
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_enable_1.json => POST__api_atlas_v2_groups_67e62e8b58616125063f0f6c_managedSlowMs_enable_1.json} (81%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{DELETE__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json => DELETE__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_1.json} (78%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_1.json => GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_1.json} (65%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json => GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_1.json} (65%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_2.json => GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_2.json} (62%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{POST__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_endpointService_1.json => POST__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_endpointService_1.json} (68%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAzure/{DELETE__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json => DELETE__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_1.json} (77%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAzure/{GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_1.json => GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_1.json} (62%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAzure/{GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json => GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_1.json} (64%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAzure/{GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_2.json => GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_2.json} (59%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAzure/{POST__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_endpointService_1.json => POST__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_endpointService_1.json} (68%)
 rename test/e2e/.snapshots/TestPrivateEndpointsGCP/{DELETE__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json => DELETE__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_1.json} (78%)
 delete mode 100644 test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_2.json
 delete mode 100644 test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_3.json
 delete mode 100644 test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_4.json
 rename test/e2e/.snapshots/TestPrivateEndpointsGCP/{GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_1.json => GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_1.json} (62%)
 rename test/e2e/.snapshots/TestPrivateEndpointsGCP/{GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json => GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_1.json} (64%)
 create mode 100644 test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_2.json
 create mode 100644 test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_3.json
 rename test/e2e/.snapshots/TestPrivateEndpointsGCP/{POST__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_endpointService_1.json => POST__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_endpointService_1.json} (67%)
 delete mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_1.json
 delete mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_2.json
 delete mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_processes-244_1.json
 create mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_processes-244_2.json
 create mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_provider_regions_1.json
 rename test/e2e/.snapshots/{TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_processes_1.json => TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_processes_1.json} (54%)
 rename test/e2e/.snapshots/TestProcesses/{GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net_27017_1.json => GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_processes_atlas-r30hxf-shard-00-00.3x5fr.mongodb-dev.net_27017_1.json} (54%)
 delete mode 100644 test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_1.json
 rename test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/{GET__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json => GET__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_1.json} (84%)
 rename test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/{PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json => PATCH__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_1.json} (83%)
 rename test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/{PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_2.json => PATCH__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_2.json} (83%)
 rename test/e2e/.snapshots/TestRestores/{DELETE__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json => DELETE__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json} (76%)
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_1.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_2.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_3.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_4.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_4.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_5.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_1.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_2.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_1.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_2.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_3.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_4.json
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_1.json} (50%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_1.json} (52%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_2.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_2.json} (52%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_3.json} (52%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_1.json} (55%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_3.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_2.json} (52%)
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_2.json
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_2.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_3.json} (55%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_4.json} (54%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_3.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_5.json} (53%)
 rename test/e2e/.snapshots/{TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_provider_regions_1.json => TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_1.json} (72%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_1.json} (70%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_2.json} (70%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_1.json} (70%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json => GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json} (71%)
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_backupRestores2-604_1.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_backupRestores2-604_2.json
 rename test/e2e/.snapshots/{TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_provider_regions_1.json => TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_provider_regions_1.json} (55%)
 delete mode 100644 test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_1.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_1.json
 rename test/e2e/.snapshots/TestRestores/{POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json => POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_1.json} (53%)
 rename test/e2e/.snapshots/TestRestores/{POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_2.json => POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_2.json} (56%)
 rename test/e2e/.snapshots/TestRestores/{POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_1.json => POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_1.json} (56%)
 create mode 100644 test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e6307658616125063f2692_clusters_1.json
 rename test/e2e/.snapshots/TestSchedule/{DELETE__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json => DELETE__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json} (58%)
 delete mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_1.json
 delete mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_2.json
 create mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_1.json
 create mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_2.json
 rename test/e2e/.snapshots/TestSchedule/{GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json => GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json} (53%)
 rename test/e2e/.snapshots/{TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_provider_regions_1.json => TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestSchedule/{PATCH__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json => PATCH__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json} (55%)
 delete mode 100644 test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_1.json
 rename test/e2e/.snapshots/{TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json => TestSearch/DELETE__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_67e630a47062fc48ea34e9ec_1.json} (80%)
 delete mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_provider_regions_1.json
 delete mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_1.json
 delete mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_2.json
 rename test/e2e/.snapshots/{TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_provider_regions_1.json => TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_provider_regions_1.json} (55%)
 create mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_1.json
 create mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_2.json
 rename test/e2e/.snapshots/TestSearch/{GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json => GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_67e630a47062fc48ea34e9ec_1.json} (66%)
 rename test/e2e/.snapshots/TestSearch/{GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_sample_mflix_movies_1.json => GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_sample_mflix_movies_1.json} (67%)
 rename test/e2e/.snapshots/TestSearch/{GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_1.json => GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_67e6306658616125063f2609_1.json} (68%)
 rename test/e2e/.snapshots/TestSearch/{GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_2.json => GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_67e6306658616125063f2609_2.json} (67%)
 rename test/e2e/.snapshots/TestSearch/{PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_67e42f89adba6513a8c62ace_1.json => PATCH__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_67e630a47062fc48ea34e9ec_1.json} (63%)
 delete mode 100644 test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_1.json
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_1.json => POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_1.json} (57%)
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_1.json => POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_1.json} (64%)
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_2.json => POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_2.json} (58%)
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_3.json => POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_3.json} (61%)
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_search-78_1.json => POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_search-926_1.json} (68%)
 rename test/e2e/.snapshots/{TestSearch/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json => TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json} (80%)
 delete mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_provider_regions_1.json
 delete mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_1.json
 delete mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_2.json
 rename test/e2e/.snapshots/{TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_provider_regions_1.json => TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_provider_regions_1.json} (56%)
 create mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_1.json
 create mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_2.json
 rename test/e2e/.snapshots/TestSearchDeprecated/{GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json => GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json} (67%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_sample_mflix_movies_1.json => GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_sample_mflix_movies_1.json} (68%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_1.json => GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_67e6328b7062fc48ea34f758_1.json} (67%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_2.json => GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_67e6328b7062fc48ea34f758_2.json} (68%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{PATCH__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json => PATCH__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json} (75%)
 delete mode 100644 test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_1.json
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_1.json => POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_1.json} (68%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_2.json => POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_2.json} (61%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_3.json => POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_3.json} (57%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_4.json => POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_4.json} (64%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_search-811_1.json => POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_search-90_1.json} (67%)
 rename test/e2e/.snapshots/TestServerless/{DELETE__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json => DELETE__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
 create mode 100644 test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_1.json
 rename test/e2e/.snapshots/TestServerless/{GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json => GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json} (51%)
 rename test/e2e/.snapshots/TestServerless/{GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_2.json => GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_2.json} (50%)
 rename test/e2e/.snapshots/TestServerless/{GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_3.json => GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_3.json} (50%)
 delete mode 100644 test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
 create mode 100644 test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
 rename test/e2e/.snapshots/TestServerless/{POST__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json => POST__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_1.json} (52%)
 rename test/e2e/.snapshots/TestShardedCluster/{DELETE__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_cluster-988_1.json => DELETE__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_cluster-970_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_provider_regions_1.json
 delete mode 100644 test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_1.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e62e8358616125063f0cab_clusters_cluster-797_1.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_2.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_3.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_4.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_5.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_6.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_7.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_8.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_1.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_2.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_3.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_4.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_5.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_6.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_7.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_8.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_9.json
 rename test/e2e/.snapshots/TestSharedClusterUpgrade/{GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_provider_regions_1.json => GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_provider_regions_1.json} (62%)
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_tenantUpgrade_1.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e62e8358616125063f0cab_clusters_tenantUpgrade_1.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_1.json
 rename test/e2e/.snapshots/TestSnapshots/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_1.json} (87%)
 rename test/e2e/.snapshots/TestSnapshots/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json} (83%)
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_1.json
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_2.json
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_3.json
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_4.json} (81%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_1.json} (56%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json} (61%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_2.json} (60%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_3.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_3.json} (60%)
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_4.json
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_5.json
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_6.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_2.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_3.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_4.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_5.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_6.json
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_1.json} (77%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json} (76%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_2.json} (76%)
 rename test/e2e/.snapshots/{TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_1.json => TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_1.json} (62%)
 rename test/e2e/.snapshots/TestStreams/{DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json => DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json} (80%)
 rename test/e2e/.snapshots/TestStreams/{DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json => DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json} (78%)
 rename test/e2e/.snapshots/TestStreams/{DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json => DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_67e62e9158616125063f111a_1.json} (78%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json => GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_1.json} (67%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_2.json => GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_2.json} (57%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json => GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json} (62%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_auditLogs_1.json => GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_auditLogs_1.json} (71%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json => GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_1.json} (55%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json => GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json} (62%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json => GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_1.json} (56%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json => GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_67e62e9158616125063f111a_1.json} (60%)
 rename test/e2e/.snapshots/TestStreams/{PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json => PATCH__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json} (60%)
 rename test/e2e/.snapshots/TestStreams/{PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json => PATCH__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json} (91%)
 rename test/e2e/.snapshots/{TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_1.json => TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_1.json} (62%)
 rename test/e2e/.snapshots/TestStreams/{POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json => POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_1.json} (63%)
 rename test/e2e/.snapshots/TestStreams/{POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json => POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_1.json} (64%)
 rename test/e2e/.snapshots/TestStreamsWithClusters/{DELETE__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_1.json => DELETE__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_instance-567_1.json} (80%)
 delete mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_1.json
 delete mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_2.json
 create mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_cluster-489_1.json
 create mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_cluster-489_2.json
 create mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_provider_regions_1.json
 delete mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_1.json
 rename test/e2e/.snapshots/{TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json => TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_1.json} (64%)
 rename test/e2e/.snapshots/TestStreamsWithClusters/{POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_connections_1.json => POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_instance-567_connections_1.json} (75%)

diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_1.json
deleted file mode 100644
index 4fa37b52e0..0000000000
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVTW/bOBD9KwXPiWXJa6nVTbHdwIU/AktptlkUASWOZW4oUiApF27g/75DU00TF1v00t2DAZnDefPImff4RCjbU1kBmyi55XWnqeVKkvSJVJ2xqlm3II0RE97uQPs9hTBhRNK/Pl+QhkvedM1M0lIAw8CNVlZVSpCUFIs8fIjIBbHCvExfKgYYns7eZ7eLghwvSEmrx67tQUi6pcIArnLcL6GySjs6cBbWQNmNhi1oQPoIaKBSklF9cJCVQPagi0PrQpvZzWI+yfJZgXQqj4qnzK3msjaI7jIQ0MIUf5gQDaPx5XB0GcVFGKejJB0n95jKuHnM+Ve4viLpaDgY+pU7qvEevp3r/e1i8enhLtssZ1NMQXL60Lpqmd2AsXhBe84Aj0RW69UMd9RClVRMPOEcxHZJJa2B5TuqGeI+n7jWqmvneAMkTuCPiMUhZSWNx+GIvq3G2zJmiMZfxMfvkqSMkiTeJjQZRxQwLmgJwvjuCS4f3ecT2eFFYt7O2takQVAJ1bFLBvtBo2StWDmoVBPQlgfUCmqCfRScyJjg35gEfQNMQKsKjFmo2lzGSUJc48SpW2KLjfoPSwd+zAKNXVAaPqjSPLN5Vf1V5Ze7/xe6RtLW7JT9FbLf9x6dOF1kerWkfyv9EQucdE3eDobkOfZqeRBjQNLGTfEPXWtpZ16or+X2XK8aWsGrk33kLVR+sH4yju/cOMquOc057g4dRI3Z3iZ8PkpBHCyvTA+JiNJYZ1hOh4i9DIe9MOfrm9zJcoiyhNJ8VKJroDeAvMhW02zjBClRphPVSUvSIcqedlblFRUnoaHpqabtnAX8aDitBsbRN/ZwfnKD+TBVX+TrwNHzcmZxjnbEGAh0Ibf4O442OjrCXGluDyRN3B/vOyvf3+wuJ95D11Icftfl+n72JW/zh1mWFw/haTi/Kgnzn3iVm0W3p0++x883PlMrZSegbV99nm+uN+t18WeIGcjefkuZbGZZMV9duxeI1r3lodDQq09D6p4q/w6c93PvVbHBDlED+QHl2SDgosjJ8R/LhFdgMQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/clusters/accessLogs-677",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "799"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:58 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "99"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_2.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_2.json
deleted file mode 100644
index 9f7de0fed2..0000000000
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVbW/bNhD+KwM/9Mti68WzlQoIBtd2Cw92HFhKs3UYAoo6y1woUiMpdW7g/76jpLSJswbDgG6ADdi8u4f38tzDe0LzhkoG+UzJHS9qTS1XksT3hNXGqnJTgTRGzHi1B935pMIEIYl//e2MlFzysi4XkmYCcjRcaWUVU4LEJF0lwW1IzogV5nH4WuWA5vni7fR6lZLjGckou6urHoTEOyoM4ClHfwnMKu3SgROzBppfadiBBkwfAQ0wJXOqDw6SCcwedHqonGm7uFotZ9NkkWI6rEPFKhOruSyMQzeWuliEJ6WShcqz2PMoY4C1q8IMJlE0MHt0GPg+fobmz0qrYe86yKEZSrBxGPlBdPbVsODfhYUvhXk/YsyF1TW8orXdJ6rWDC5ojpN5paESnNEE7AW1gppBszMfz/94gMZePJSd6OZL5d8b3Tyr/u9zaFuNk7Awxy9ChH44HvijQThJg0k8iuJx9AHvybm5S/gnePeGxCN/6HcnN1Rjmg+EeHu9Wv1yezPdrhdzDMGp6kPlxjS1WzAWmdXwHJAL5HJzuUCPQqiMilk36QTEbk0lLSBPXHmI+5kqhVZ1tXSznUTwQ5hPAppndDIORvScjXfZJEc0/sg+fh1FWRhFk11Eo3FIAe2CZiBMR3vB5Z37eU/2yECM21tbGewZE6rO2+b0jRoyVXq04l47AK8JvTYZ430tE69nrun7v+r7TxzjRUtzscO2/4dXe91+ehqnoDT8pDLzOZsntz+5+bH3/5KukbQye2X/SbJffI9O1Zxl/mZNf1f6PV7QCiI5H7qN6W1PjocTNEhaOhY/m1pFa/NItipuT4WuX9NWkSpgHbFeoONrR0dZly3P0TtwEAVGd/raxeMqiIPlzPSQiCjdtjNwe4jY68DvF3O5uUrcWvq4lpCZ90rUJfTKmaTTy/l06xZS4prOVC0tiX1ce1QblTAq2kXD10KVVe0k4LlSVxpyjoLbwGnlBuNhrj7Kp4Zjl5cTi1O0I9pAoHy7w29R2ujoEuZKc3sgceT+dLpz2c13epOQ7vHZSHH4Vs3t5tlfeZ3cLqZJehu05PykJCxf0CrHRefTB3/An991kVopOwNt+9uXyfbddrNJfw66h8A+hCznKyevlha93OGSoU63BHXve/d4ns6y6TZii9OhBpIDrmaJYKs0Ice/AOd8NHJmCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/clusters/accessLogs-677",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "903"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:59 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "90"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_accessLogs-597_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_accessLogs-597_1.json
new file mode 100644
index 0000000000..a44d5982fa
--- /dev/null
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_accessLogs-597_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoUkDtF3eQtuhTv1ATYCNaUKuc5t6OHZkO50K6n/fdR0YLWLaC9tDpdTX99xj33uOHwnN11QyyPtKLnlRa2q5kiR+JKw2VpWzCqQxos+rFWi/JxOmHZH42/cjUnLJy7ocSroQkGPgUiurmBIkJtk4bd9F5IhYYV6mT1QOGB4MPyVX44xsj8iCsvu6akBIvKTCAK5y3C+BWaUdHTgIa6D5pYYlaED6CGiAKZlTvXGQTCB70NmmcqH58HI86ifpMEM6zKPiKVOruSwMorsMBLQwwB8mRGF0dhyeHEe9LDyLw24chbeYmnNzn/IHuDgn8UnYCv3KDdV4D0/n+nQ1Hn+9u0nmk+EAU5Cc3lSuWmLnYCxe0JrngEci09l0iDsKoRZU9D3hFMRyQiUtIE9XVOeI+3ziQqu6GuENkE4XOhH0Ot2wEy3ZaQ/oyWkeMnfZ/EW8txdvg4sLugBhfPcEl/fu85Gs8CIxb2VtZeIgYELV+XEO61apZKHyRYupMqAVD6gV1ATrKNiRMcFbTIKmASagjIExY1WY47OPXeIaJ3bdEkts1D8sHfgxCzR2QWn4rBbmmc1e9b3KL3f/F7pG0sqslP0bsr/3bp04XWRwPqE/lL7GAjtdk14rJM+xveVWBwOSlm6KX3WtorV5ob6K20O9aqgEZzv7SCtgfrD+MI7Mwcq63M057m47iAKzvU34fJSC2FjOTAOJiNJYZ1hOh4g9aYeNMEezy9TJMkRZwsJcK1GX0BhAmiXTQTJ3gpQo076qpSVxiLKntVUpo2InNDQ9VVa1s4DXhlNpyDn6xhoOT24wHwbqp9wPbD0vZxaHaFuMgUAXcovvcbSTrSPMleZ2Q+Ku++N9Z+r7m9ykxHvoTIrNe12u72dT8iq9GyZpdtfeDeeDkjB6ezhy51VuT5N8i58ffKZWyvZB26b6KJ1fzGez7EsbM5C9fUrpz4dJNppeuBeIFo3lodDQq3dD6p4q/w4c9nPtVTHHDlED6QblWSLgOEvJ9heKm7aHMQcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e867062fc48ea34d0c2/clusters/accessLogs-597",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "787"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "62"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_accessLogs-597_2.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_accessLogs-597_2.json
new file mode 100644
index 0000000000..3a25504d10
--- /dev/null
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_accessLogs-597_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVbW/bNhD+KwM/9Etj6yWN7QoIBtd2Cw92HJhKs3UYApo6y2woUiApDW7g/76jpLSxsxTDgG6ADdi8u4f38tzDB8KymikO2USrrcgrw5zQiiQPhFfW6WJVgrJWTkS5A9P6pNJGMUl+/+OMFEKJoipmim0kZGi4NtppriVJSLqg0V1MzoiT9mn4UmeA5uns/fhmkZLDGdkwfl+VHQhJtkxawFOB/gq408anAydmAyy7NrAFA5g+AlrgWmXM7D0kl5g9mHRfetN6dr2YT8Z0lmI6vEXFKqkzQuXWo1vHfCzCk0KrXGebJAgY54C169z2Lt4Oe3aHDr0wxE+fAbO637n2Mqj7ClwSD8NoePZiWPTvwuLvhQU/Y8ylMxW8YpXbUV0ZDpcsw8m8MlBKwRkFd8mcZLZX12r/OX+Exl48lk1N/a3y19bUz6r/+xyaVuMkHEzxixBxGF/0wvNePErDiyQcJnH4Ce/JhL2n4gt8eEeS87Aftie3zGCaj4R4f7NY/HZ3O14vZ1MMwamafenHNHZrsA6ZVYsMkAvkanU1Q49c6g2Tk3bSFOR2yRTLIaO+PMT9SpXc6Kqc+9kOhjCIYTQYhoN4y9+MgJ2/yULuWSqe2EdH9gi8XbINSNvSXgp1738+kB0yEON2zpUWe8alrrKmOV2j+lwXAStF0AwgqOOgScYGL2USdMy1Xf8XXf+JZ7xsaC632Pb/8Oqg3c/A4BS0gV/0xn7N5uj2o5ufev8v6VrFSrvT7p8k+8334FXNW6bvluyzNh/xgkYQyajvN6azHR33B2hQrPAsfja1klX2iWyVwp0KXbemjSKVwFtifYeO3MOqqmh4jt6Rh8gxutXXNh5XQe6d4LaDRETlt52D30PEXkZht5jz1TX1axniWsLGftSyKqBTTpqOr6bjtV9IhWs60ZVyJAlx7VFtNOVMNouGr4UuyspLwHOlLg1kAgW3htPKLcbDVP+pjg2HNi8vFqdoB7SBRPn2hz+itPODT1hoI9yeJEP/p9Wdq3a+41tK2sdnpeT+RzW3nWd35Q29m41pehc15PyiFcxfJkfmtcr7dMGf8OdPbaTR2k3AuO72OV1/WK9W6a9R+xC4x5D5dOHl1bG8kztcMtTphqD+fW8fz9NZ1u1GrHE6zALd42oWCLZIKTn8BXeFmZhmCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e867062fc48ea34d0c2/clusters/accessLogs-597",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "891"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:49 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "63"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_provider_regions_1.json
index 435244704e..07163132fd 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHKm9boVyijS4cAbVnEwRNL2qGFpU5LUhw3/+2JF1Clt9piTL+d8yUnygxhNvyRyPn/QTsAGOWinVCYdjCPG8/gphn0j4emWx2Ej4gkmGcVEMSLxvom3gueZxN0etJvxS5fEIel27BZ5jrpWK+zpFLlUICTOBN/TGAQWsKU8la801XMx9HmeKleJHGpnRLreMqgpCsId2VYtI1sY54lr16iCRE5BTHXEtS0L1ZEApoUlsA06rI5DmTN12gxNpSJpBAH9hlOE7AllJGQwOzkUwRg2RK9BztGhjlKSgM64CNa+F8zXNjrUr5gNYfIealZAS/8+099qBVOaqO+t+/54PvOG5Vb+Yj2ezOaDSuqR1mOo1OsMtSogU/kzV1o08Az6403NoGCymA+qO3lDlu72hmxXkEWzjDwvZJXnhTT3NDolQ6rUb+Sb3QXNmdR8M6H0vfoPVer/PjTz1w+2+ondtKBjTPZKD+7jWnB1idtWMTx/tMeky6AIKa4IK/5i5NiHXzgvWLEUBgAA",
+  "Body": "H4sIAAAAAAAAAJWUUWvCMBCA/0se+uRMW10dhTKKdDhwTqziYIjE9qphaVOS1IcN//tiRZybtNljLl/uvuSSfCFGiw+J/PcvtBOQIR/tlCqlj3HCeJXepbDv5rzY8nTTTXiOSUkxUYxIvHfxVvCqlNgbgOfCgzewPTdL+g9Aev3UTlydopIKhMSl4HuagsACtpQX8pEWei6FIa8KFShRgXVGZBAuY0tREMGLY1sl2cKkygPHogpyOQUx1ZHAsW3UQQKYFpbAMnRYHYeyYuq0GVpIRYoEYvoJpwjZE8rIhsHs5FAHU8iIXoP8o0MHFSQHnXERr6Mwnq8ddOj8YDLC5F/IbYGW0d9Mv6vVTGOiYbgeRpP5LBw3W0WL9eR1Nh+1Ure0bkONXmeo1wKZyp+5xqJxaNCfcGoGxa+L+ai9k1dk426vyH4LWTfLyPNCtnleSHNPo1MypBr9XiKzu6A5k5pPJpS+V/+hGv2fx2b++sG2P7GrFtwbk4PGg3v7Kbi6xB27Hp4/2mPSZVyHFFeE1X8x8p3DN6VuV+0UBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e62e867062fc48ea34d0c2/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:48 GMT"
+      "Fri, 28 Mar 2025 05:07:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "78"
+      "70"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_clusters_accessLogs-677_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_dbAccessHistory_clusters_accessLogs-597_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_clusters_accessLogs-677_1.json
rename to test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_dbAccessHistory_clusters_accessLogs-597_1.json
index 2c03eee70a..bd1cde23ff 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_clusters_accessLogs-677_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_dbAccessHistory_clusters_accessLogs-597_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJhY2Nlc3NMb2dzIjpbXX0=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/dbAccessHistory/clusters/accessLogs-677",
+  "Path": "/api/atlas/v2/groups/67e62e867062fc48ea34d0c2/dbAccessHistory/clusters/accessLogs-597",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:48:00 GMT"
+      "Fri, 28 Mar 2025 05:15:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "386"
+      "166"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_processes_atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_dbAccessHistory_processes_atlas-vvnyjg-shard-00-00.aeaso.mongodb-dev.net_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_processes_atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net_1.json
rename to test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_dbAccessHistory_processes_atlas-vvnyjg-shard-00-00.aeaso.mongodb-dev.net_1.json
index 2a0e8884b8..72751f4cf4 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_processes_atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_dbAccessHistory_processes_atlas-vvnyjg-shard-00-00.aeaso.mongodb-dev.net_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJhY2Nlc3NMb2dzIjpbXX0=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/dbAccessHistory/processes/atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net",
+  "Path": "/api/atlas/v2/groups/67e62e867062fc48ea34d0c2/dbAccessHistory/processes/atlas-vvnyjg-shard-00-00.aeaso.mongodb-dev.net",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:48:01 GMT"
+      "Fri, 28 Mar 2025 05:15:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "356"
+      "292"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_processes_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_processes_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_processes_1.json
rename to test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_processes_1.json
index 7b8c0d675e..f42e1abab7 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_processes_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_processes_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAANWVX0/CMBTFv0sfeHLrNmDDJcQQ5IFEcUFf1BhT1sto7NbZ26HG8N3tQF/UBSHxX9KX9t7T/Npz0j4TKYo7JPH1M1lomJOYLIwpMaY0lariDoelm6siU3zmpiqnrBSUGcmQLgOaaVWVSMMIOgEPfcZnLOz6bdZLu/NZyGmpVQqIgEeiSGXFYaiqwvSNrqBVsgwmVd73W8JAjgnoxK70fc8jB0SDtCQIck5WN/UUK2k2lKkGZoDbcuAFXcdrO0F44YdxJ4r9zpXVrqHGdUMTl21aKDQFy8F2rU/jLOf40Lt3cME0dzzPDhcfLf/b4dcXUYCxWsF3VsVB5PmR1VqRSUSRfYbfOazxf8QPuif+O19KpQ3ZFOtaKUXKzsFMmi/W7mGeSnjtmI6Sk/FwcHs+Gp5NjgfTS1uuEPRACob1DmmNK1WGThhFXzJnCRqFKqy453puSFYHPxcZf6/INKj+S2S24X9TZJLp+HSHwDRb85uBCfYKTIPqvwRmG/5feWOazfkQGYtplGFy/b2RuL16AQVys6RXBwAA",
+  "Body": "H4sIAAAAAAAAANWVQU/bMBTHv4sPnEjsuDQpkSpUdRwqQReVXQChyTivqTfHjvycSAj1u89pxwWIGJXGhuSL897f+tnvJ+WRaGV+IslvH8nGwZrkZON9gzmlUtu2jEro4tqaypb3sbQ1FY2iwmuBtOO0crZtkKYZpBwmacZSvpYnExCjk5JJThtnJSACnikjdVvC3LbGT71r4agRFSzbepocKQ81FuCK8GWaMEaOiQMdSBD0mmzv+i222u8ppQPhoQxlzvg4YqOIT76xcZ6EldyE7A5q0TcMcYWmjUVvRA2ha3ebqOvMw48qwo1wZcRYWLEAgfbp8ruHMOBDVpXvTuU8Y0kWsiHkC2Wq1/BHpz3+h8yDHoj/bC6NdZ7si32t0UqKK/DL4YcNZ/iHBn53rM6Li8V89v3qfP51+WW2ug7lFsHNtBLYnyB7XG0rjMan2R8NpwOHypoQnsQsTsn2+OOUSQ5SZiD1WZR5C/9/UWZ4OP9SGX6QMgOpz6LMW/h/SZlitbh8hzDDo3khTID01gu9+72RfLT9BUUeUy9XBwAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/processes",
+  "Path": "/api/atlas/v2/groups/67e62e867062fc48ea34d0c2/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:59 GMT"
+      "Fri, 28 Mar 2025 05:15:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "56"
+      "41"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index d17a72d6b9..0914647488 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:07:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_1.json
index 20776a0fb3..aeff1df1de 100644
--- a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniIkJJmXtVKlju7TqcPiOD9Vg5DPpEPHfC4qalqViYb6nd0863VUYO3Ig/+jGPogiiYTxBIFQFEIlKouTNFb65aiLNC+y7E1Eol1mOqeTQn0ELEFnxxTOJqtKjfPctv0ni+L9KhpP1cw2IQxcSGmsGzFGuhw619cOy4NxnYShlRAssLwoWXs3Diz/sXuys5LJVmKKdlghjesDtD15vm9b2VfmP/BONbfzbGr5QfcpQQhQAtMrb8tZ8/s0DbSt5cbt1OCdIWba1HFn92n5atpAtuWwoeWXnT4i0UNHMw5m6Xt2NcekKFbqYTY5Xz8tP59RhaDPCtJKESrKEbVBOonpG3C45vZHBAAA",
+  "Body": "H4sIAAAAAAAAALWTu26EMBBF/8U1rB0DhtCmipQyaRKlmLWHh9bYyGM2xYp/D2iVTbaJaKjv0b1HGs2FaTtRxPDkJxdZLRKmA0JEw2omhSxSkaWyehVFLcr64fGdJaxfM1WiklipUijZ6LxCyHIjtFxy27sTsfrjwrqAzcJ2MY5Uc66tn0xq8HwYvGu9OR60HziMPYdogfhZ8jb4aST+T3tAu1QS2obNyQ4TXHsXoXcY6LZ2137X/AfeyeZ6nk0uP+g+JgYiHIHwjbbp3PP7OI24zeXK7eQQvEYi3ORxY/dx+er6iLanuMHll50/E+ZgwAUHvfq9+JZSlJhm2fpyPrTP688X2BhQlYSskWgklsYobTBn8zfN/rv6RwQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "285"
+      "286"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:53 GMT"
+      "Fri, 28 Mar 2025 05:07:18 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2808"
+      "1288"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_1.json b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_1.json
deleted file mode 100644
index 735cf770c4..0000000000
--- a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVTW/bOBD9KwXPiWXJa6nVTbHdwIU/AktptlkUAUWObW4oUiApF27g/75D000TF1v00t2DAVkz8+aRM+/piVC+o4oBH2m1FpvOUCe0IvkTYZ11ulm2oKyVI9FuwYScSto4Iflfny9II5RoumaiaC2BY+DGaKeZliQn1ayMHxJyQZy0L8vnmgOGx5P3xe2sIocLUlP22LUnEJKvqbSAbwXmK2BOG08HzsIGKL8xsAYDSB8BLTCtODV7D8kksgdT7VsfWk1uZtNRUU4qpMMCKp6ydEaojUV0X4GADsb4w4Kknwwv+4PLJK3iNB9k+TC7x1Iu7GMpvsL1FckH/V4/vLmjBu/h27ne385mnx7uitV8MsYSJGf2re9WuBVYhxe0ExzwSGSxXEwwYyN1TeUoEC5BrudU0Q3wcksNR9znE2+M7top3gBJM/gj4WlMeU3TYTygb9lwXacc0cSL+PBdltVJlqXrjGbDhALGJa1B2jA9KdSjf3wiW7xIrNs619o8ipjUHb/ksOs1Wm00r3tMNxFtRUSdpDbaJdGRjI3+jUl0GoCNKGNg7Uxv7GWaZcQPTh6nJdc4qP+wdRTWLDI4BW3gg67tM5tX3V91fpn9v9C1irZ2q92vkP2ee/Di9JHx1Zz+rc1HbHDUNXnb65Pn2KvXvRQDijZ+i3+YWks7+0J9rXDnejXQSsGO9lG2wMJi/WQd3/l1VF1z3HPMjj3EBquDTYR6lILcO8HsCRIRlXXesLwOEXse90/CnC5vSi/LPsoSavtRy66BkwGUVbEYFysvSIUyHelOOZL3Ufa0c7pkVB6Fhqanm7bzFvCj4bQGuEDf2MH5yS3Ww1h/Ua8Dh8DLm8U52gFjINGF/MvfcbTBwRMW2gi3J3nm/wTfWYT5FnclCR66VHL/uy43zPPU8rZ8mBRl9RAfl/OrVjD9iVf5XfQ5p+J7fHwTKo3WbgTGnbpPy9X1arms/oyxAtm7byWj1aSopotr/wUC79DH1fQfqOD+51PcBS2scC7UQrlHUTYIM6tKcvgHdQ0s2icHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "794"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:57 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "544"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_1.json b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_1.json
new file mode 100644
index 0000000000..5d46d07bfb
--- /dev/null
+++ b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e62e867062fc48ea34d0c2_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV72/aMBD9VyZ/LiSEFli+pcAqJn5UJG23ThMyzgFeHTuyHSZa8b/vjGkHVJ32pdsHpJC7e/fsu/fyRGi+ppJB3lVywZeVppYrSeInwipjVTEpQRojurxcgfY5mTCNiMTfvp+RgkteVEVf0rmAHAPXWlnFlCAxyYZpYxaRM2KFOSwfqRww3Ot/Sm6GGdmekTllD1W5ByHxggoD+JZjvgRmlXZ04CSsgebXGhagAekjoAGmZE71xkEygexBZ5vShab96+Ggm6T9DOkwj4qnTK3mcmkQ3VUgoIUe/rAgCqOLWtisRZ0svIjDdhyF91iac/OQ8ke4uiRxM6yH/s0d1XgPz+f6dDMcfp3dJdNRv4clSE5vStctsVMwFi9ozXPAI5HxZNzHjKVQcyq6nnAKYjGiki4hT1dU54j7cuKlVlU5wBsgrTa0Iui02mErWrDzDtDmeR4yd9n8IN45ijfAxQWdgzB+eoLLB/f4RFZ4kVi3srY0cRAwoaq8lsO6Xii5VPm8zlQR0JIH1ApqgnUU7MiY4C0mwX4AJqCMgTFDtTS1i49t4gYndtMSCxzUP2wd+DULNE5Bafis5uaFzVH3o86H2f+FrpG0NCtl/4bs79ytE6eL9C5H9IfSt9hgp2vSqYfkJXb0ut7CgKSF2+JXUytpZQ7UV3J7qlcNpeBsZx9pCcwv1h/WkTlYWRW7PcfshoNYYrW3CV+PUhAby5nZQyKiNNYZltMhYo8a4V6Yg8l16mQZoixhbm6VqArYG0CaJeNeMnWClCjTrqqkJXGIsqeVVSmjYic0ND1VlJWzgNeGU2rIOfrGGk5PbrAeeuqnPA5sPS9nFqdoW4yBQBdyL9/jaM2tI8yV5nZD4rb7431n7Oeb3KXEe+hEis17Xa6f577lTTrrJ2k2a+yW81FJGLy9HLnzKpezL77Hxw++Uitlu6DtvvsgnV5NJ5PsSwMrkL19LulO+0k2GF+5LxA4h96tpvtAefc/neLaa2GKc6EG0g2KskCYYZaS7S/oYCXXJwcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e867062fc48ea34d0c2/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "781"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "546"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/memory.json b/test/e2e/.snapshots/TestAccessLogs/memory.json
index ad7652b3ca..b6dfd02dc9 100644
--- a/test/e2e/.snapshots/TestAccessLogs/memory.json
+++ b/test/e2e/.snapshots/TestAccessLogs/memory.json
@@ -1 +1 @@
-{"accessLogsGenerateClusterName":"accessLogs-677"}
\ No newline at end of file
+{"accessLogsGenerateClusterName":"accessLogs-597"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
index 9a5afc0df8..34015b33de 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites/67e42d99977b2776f7a75835",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d21b/invites/67e62e8d7062fc48ea34d307",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:52 GMT"
+      "Fri, 28 Mar 2025 05:07:28 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "56"
+      "26"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
index a6d548fa92..a325f78be1 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbuwqZt6VVBEEBWRFxUiU79ioFtsK6Lov6dEVNfnOe/hAZVB4bAeO0iB+jQifkAo2w5ZGsRpmOzBA7ydpUH7Q0JCoz9yMvpyntcdYBxDWics4byknLMjFzziovqgpWixY1JdpRNOamUJUiSBzzohfwrJXyEOon7vX2gyi0a9O+re6HursRuNbtBCeoDZZpWti810PClWy8UOcg8u34dD6wjz41Gr1UnX5aDSLTzzF4KKGFcLAQAA",
+  "Body": "H4sIAAAAAAAAAFXMywrCMBCF4XeZtZE4vaR0paCIICqiCy0ibTOWQJtIEkUU390WEXV9vv9kDygt5Z7kyEMKyDFiPGCYbHiUcpFitIce0O2sLLkfEjIUf6Sy5nKeyRbEgmKkpBA8xlMZJpQHocRB8UGLvKGWKX1VPvfKaMcIiSXtrn56+dcHXHR715DdOrL6/aLvtbk3htrRmpocpBlM18vt6riejMbH5WK+g0MPLt/Ck/Ms5PGwMboysuiXpoHn4QUHnG4rCQEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d21b/invites",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "204"
+      "202"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:50 GMT"
+      "Fri, 28 Mar 2025 05:07:26 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "51"
+      "41"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
similarity index 66%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
index 21cf52846d..dca1521be1 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbewqZt6lVBEEBVSFxUhU79ioJtsM6Lov2dEVNfnOe8dSoPCYZU6SIB6NCSeTyjbjFjiR0kQ72EAeG2lQftDAkLDP3I2umvnVQ8Yx4BWMYs5Lyjn7MQFD7koP2gpGuyZVBfphJNaWYIUie+xXsifQvxXiPzwtb9eaLYWjXp31K3Wt0ZjPxpdo4XkALNstV3n2TSd5KvlYgfHAXTfh0PrCPOicaPVWVfFsNQNPJ6lnxmCCQEAAA==",
+  "Body": "H4sIAAAAAAAAAFXMywrCMBCF4XeZtZE4vaR0paCIICpFFyoibTNKwCaSpCKK726LiHV9vv88obSUe5IjDykgx4jxgGGy5lHKRYrRDnpA96uy5DokZCj+yNma+jqTDYgFxUhJIXiMpzJMKA9CiYPiixZ5RQ1T+qZ87pXRjhESS5pddXr51wdctHvbkN04svrzoh8X86gMNaM1F3KQ7mGaLTerYzYZjY/LxXwLhx7Uv8KT8yzk8bAy+mxk0S9NBa83vH5x0AcBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites/67e42d99977b2776f7a75835",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d21b/invites/67e62e8d7062fc48ea34d307",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "202"
+      "200"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:50 GMT"
+      "Fri, 28 Mar 2025 05:07:26 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "53"
+      "32"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
index cfb8a60127..4631d4ea99 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJjcmVhdGVkQXQiOiIyMDI1LTAzLTI2VDE2OjM4OjQ5WiIsImV4cGlyZXNBdCI6IjIwMjUtMDQtMjVUMTY6Mzg6NDlaIiwiZ3JvdXBJZCI6IjY3ZTQyZDk2OTc3YjI3NzZmN2E3NTdhYyIsImdyb3VwTmFtZSI6Imludml0YXRpb25zLWUyZS0zMDYiLCJpZCI6IjY3ZTQyZDk5OTc3YjI3NzZmN2E3NTgzNSIsImludml0ZXJVc2VybmFtZSI6Im56bG96bW9lIiwicm9sZXMiOlsiR1JPVVBfUkVBRF9PTkxZIiwiR1JPVVBfREFUQV9BQ0NFU1NfUkVBRF9PTkxZIl0sInVzZXJuYW1lIjoidGVzdC02MDhAbW9uZ29kYi5jb20ifQ==",
+  "Body": "eyJjcmVhdGVkQXQiOiIyMDI1LTAzLTI4VDA1OjA3OjI1WiIsImV4cGlyZXNBdCI6IjIwMjUtMDQtMjdUMDU6MDc6MjVaIiwiZ3JvdXBJZCI6IjY3ZTYyZThiNzA2MmZjNDhlYTM0ZDIxYiIsImdyb3VwTmFtZSI6Imludml0YXRpb25zLWUyZS04IiwiaWQiOiI2N2U2MmU4ZDcwNjJmYzQ4ZWEzNGQzMDciLCJpbnZpdGVyVXNlcm5hbWUiOiJuemxvem1vZSIsInJvbGVzIjpbIkdST1VQX0RBVEFfQUNDRVNTX1JFQURfT05MWSIsIkdST1VQX1JFQURfT05MWSJdLCJ1c2VybmFtZSI6InRlc3QtNDA2QG1vbmdvZGIuY29tIn0=",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d21b/invites",
   "Headers": {
     "Content-Length": [
-      "295"
+      "293"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:51 GMT"
+      "Fri, 28 Mar 2025 05:07:27 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
similarity index 59%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
index b89865cbf1..144d923aa1 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_67e62e8d7062fc48ea34d307_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJjcmVhdGVkQXQiOiIyMDI1LTAzLTI2VDE2OjM4OjQ5WiIsImV4cGlyZXNBdCI6IjIwMjUtMDQtMjVUMTY6Mzg6NDlaIiwiZ3JvdXBJZCI6IjY3ZTQyZDk2OTc3YjI3NzZmN2E3NTdhYyIsImdyb3VwTmFtZSI6Imludml0YXRpb25zLWUyZS0zMDYiLCJpZCI6IjY3ZTQyZDk5OTc3YjI3NzZmN2E3NTgzNSIsImludml0ZXJVc2VybmFtZSI6Im56bG96bW9lIiwicm9sZXMiOlsiR1JPVVBfUkVBRF9PTkxZIiwiR1JPVVBfREFUQV9BQ0NFU1NfUkVBRF9PTkxZIl0sInVzZXJuYW1lIjoidGVzdC02MDhAbW9uZ29kYi5jb20ifQ==",
+  "Body": "eyJjcmVhdGVkQXQiOiIyMDI1LTAzLTI4VDA1OjA3OjI1WiIsImV4cGlyZXNBdCI6IjIwMjUtMDQtMjdUMDU6MDc6MjVaIiwiZ3JvdXBJZCI6IjY3ZTYyZThiNzA2MmZjNDhlYTM0ZDIxYiIsImdyb3VwTmFtZSI6Imludml0YXRpb25zLWUyZS04IiwiaWQiOiI2N2U2MmU4ZDcwNjJmYzQ4ZWEzNGQzMDciLCJpbnZpdGVyVXNlcm5hbWUiOiJuemxvem1vZSIsInJvbGVzIjpbIkdST1VQX0RBVEFfQUNDRVNTX1JFQURfT05MWSIsIkdST1VQX1JFQURfT05MWSJdLCJ1c2VybmFtZSI6InRlc3QtNDA2QG1vbmdvZGIuY29tIn0=",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites/67e42d99977b2776f7a75835",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d21b/invites/67e62e8d7062fc48ea34d307",
   "Headers": {
     "Content-Length": [
-      "295"
+      "293"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:51 GMT"
+      "Fri, 28 Mar 2025 05:07:27 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "53"
+      "48"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_1.json
index afe64c907b..0d949bac6d 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxNSAHVg7dW+XVh0O+whWHBv5TDpE/HuJoqbNUrEw39O7J53uwrSbKGF8DpNPrC0ypiNCQsNaJgpR50WZC/n6JNty31bNO8uYvc6kwkqYRjZKdUIp2StQtQK9zJ31R2Ltx4UNEfuFHVIaqeVcuzCZ3OB5dwr+EEy30+HEYbQckgPiZ8EPMUwj8X/sEd2iJHQ9m7MNVnAdfALrMdJ924P9wfwH3qjmdp5VLT/oNiUGEnRA+Ebrch75bZpGXNdy4zZqiEEjEa7quLPbtHwNNqGzlFa0/LLzZ8Y8nHDBrT/bBMkGTzkKzMtCLqoQDy/Xp6+xNyD3AspeoBGojJHaYMXmb61KQ+hIBAAA",
+  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniKn5FGun7u3SqsNhH8SKsZHP0CHiv5coalqWisXzPb170umuTJqZAvpnN9vA2ixh0iMEVKxlIhNlmuWpaF6zss3qVpTvLGH6NqtqrAQ2XZ1VopdFg5AXSjx129xoeyHWflzZ2WO/secQJmo5l8bNKlW4nEZnB6e6k3Qjh0lzCAaIL4IP3s0T8X/sHs2mJDQ9W5MIK7h0NoC26OmxbWffmf/AkWru5znU8oPGKVEQoAPCNzqWs+fjNE14rOXORWrwTiIRHup4sHFavs46oNEUDrT8sutnwiyMuOHaLjpA0M5SigLTZhM5P7zcXr7EXkHVCMh7gUpgrVQlFRZs/QYUlPr3RgQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "285"
+      "283"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:46 GMT"
+      "Fri, 28 Mar 2025 05:07:23 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2399"
+      "1676"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
index b68dfa2890..99b5b2769c 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d21b_invites_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbewqZt6lVBEEBVSFxUhU79ioJtsM6Lov2dEVNfnOe8dSoPCYZU6SIB6NCSeTyjbjFjiR0kQ72EAeG2lQftDAkLDP3I2umvnVQ8Yx4BWMYs5Lyjn7MQFD7koP2gpGuyZVBfphJNaWYIUie+xXsifQvxXiPzwtb9eaLYWjXp31K3Wt0ZjPxpdo4XkALNstV3n2TSd5KvlYgfHAXTfh0PrCPOicaPVWVfFsNQNPJ6lnxmCCQEAAA==",
+  "Body": "H4sIAAAAAAAAAFXMywrCMBCF4XeZtZE4vaR0paCIICpFFyoibTNKwCaSpCKK726LiHV9vv88obSUe5IjDykgx4jxgGGy5lHKRYrRDnpA96uy5DokZCj+yNma+jqTDYgFxUhJIXiMpzJMKA9CiYPiixZ5RQ1T+qZ87pXRjhESS5pddXr51wdctHvbkN04svrzoh8X86gMNaM1F3KQ7mGaLTerYzYZjY/LxXwLhx7Uv8KT8yzk8bAy+mxk0S9NBa83vH5x0AcBAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d21b/invites",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "202"
+      "200"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:49 GMT"
+      "Fri, 28 Mar 2025 05:07:25 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "233"
+      "168"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/memory.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/memory.json
index 1f33f72c72..f9e18d2e48 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/memory.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/memory.json
@@ -1 +1 @@
-{"rand":"AmA="}
\ No newline at end of file
+{"rand":"AZY="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_1.json
deleted file mode 100644
index 2fee681553..0000000000
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVTW/jNhD9KwXPiSXLsZXoprW9gQt/BJayabcoAkocyWwoUiApL7yB/3uHpjZ1XGzRy2IPBmQO5/ENZ97jK6FsT2UJbKpkxetOU8uVJMkrKTtjVbNpQRojprzdgfZ7cmGGEUn++POKNFzypmvmkhYCGAYetLKqVIIkJF9mw+eIXBErzHn6SjHA8Gz+MX1c5uR4RQpavnRtD0KSigoDuMpxv4TSKu3owEVYA2UPGirQgPQR0ECpJKP64CBLgexB54fWhbbzh+VimmbzHOmUHhWrzKzmsjaI7jIQ0MIMf5gQhdH4OhxdR5N8OElGcTIOP2Mq4+Yl41/h/gNJRuEg9CtPVOM9fKvr4+Ny+fvzU7pdzWeYguT0oXWnpXYLxuIF7TkDLImsN+s57qiFKqiYesIZiGpFJa2BZTuqGeK+VVxr1bULvAEyieEmYuOCsoJOxsMRvS3HVVxUiMbP4nAXx0UUx5MqpvE4DGOMC1qAML57gssX9/lKdniRmLeztjVJEJRCdeyawX7QKFkrVgxK1QS05QG1gppgHwUnMib4HpOgb4AJ0s6qGiTgYLkhaxoqmbm+je6I66E4NU5U2LOfwyLwwxdo7I3S8KsqzBuxd0TekTjf/bOZG0lbs1P2//D+Z+/RqddFZh9W9C+lP+FZJ+GT20FI3mLvlgcTDEjauDH/r7a2tDNnSm25vdS2hlbw8mQ1WQulH8Lz0WXno3tT3TlY2TUnTeDuoYOoMdtbis9H2YiD5aXpIRFRGuvMzWkWsVfDsBfxYvOQOQmHKGEozCclugZ6s8jydD1Lt068EiU9VZ20JAnRIijWnJVUnESJBqmatnN28W9zajUwjh6zh8vKDebDTH2R7wNHz8sZyyXaEWMg0LHc4o8obXR0hLnS3B5IErs/3qPWfaufMuL9diPF4Uddru9nf+Rj9jxPs/x5eJrTr0rC4nu+dlOVjPg9ffJn/PzFZ2ql7BS07U9fZNv77WaT/zbEDGRvv6VMt/M0X6zv3WtF694eUX7o66chdc+afzMu+7n3Atlih6iB7ICibRBwmWfk+Df3DlcvXQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters/AutogeneratedCommands-829",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "811"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:50 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_2.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_2.json
deleted file mode 100644
index 84c2c09148..0000000000
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVWbW/aSBD+K6f90C8N+IUXJ5aiEwVacYIQYafptTpFa+/Y+LLetXbXnGjEf79Z20kJd2krVVUlkIxn5vF4nnme5YFQtqMiBTaVIivyWlFTSEHCB5LW2shyXYHQmk+LaguqzYm59nwSfvrrjJSFKMq6nAuacGAYuFbSyFRyEpJ4GXl3Pjkjhuvj8pVkgOHZ/O3kZhmTwxlJaHpfVx0ICTPKNeDdAvMFpEYq2w6chBVQdq0gAwXYPgJqSKVgVO0tZMqxe1DxvrKhzfx6uZhOonmM7aQtKr5lZFQhcm3RtaG2FuFJKUUuWRI6Dq2NzEEAzgRYKssSc3TvvKe3mNlzXfz0h8mWDvtdTY/Bri/AhH7gesHZt+u9H6z3v1bv/I7EXRpVwytE2kayVilcUoakvVJQ8SKlEZhLajjVPW+QX7DxIzSO6XEikdp9GcprrXYvD+b/m2noQLYMzPCLWL7rj3ruoOePY28cDoJw5H7EB7JC30fFZ3j3hoQDt++2d26pwn4fl+btzXL5593tZLOaz7AEmVf7ylI5MRvQBrdvVzDAfSFX66s5ZuRcJpRP222IgGcrKmgOLLLvibhP65QrWVcLy/84gKHPRgllCR2PvAE9T0dZkGSIVhzF4SIIEj8IxllAg5HrBhjnNAGuW2nwQtzbyweyxS3Fuq0xlcbhpVzWrBlON6g+TtChVeE0TDg732ma0c5LnTjddmtnckzE9IkI/4JYgfBGFTxDBn5NF06rbEchN1LBHzLRT409a+RZE8fZv7pzLWilt9J8T99fcg/WGm1k9mZF/5bqPT6rcVVy3rfa6mLPbvfHGBC0tGv+NVorWusjG6wKc2qcnbYbh6sgbZfweHXZ8eoOswsLK+qy0QRmexYix+rWr9t6lA3fmyLVHSQiCmsRKVjNIvbKczsRL9bXkZWwixKGRL+XvC6hc+IonlzNJhsrXoGSnspaGBK6aBHWU6KU8kaUePrIsqqtXfzX+SsFrEAD38Hpm2ush5n8RzwPHNq+rLGcoh0wBhyPA3vzZ7za4GAbLqQqzJ6Egf3RetRVR/VtRNrDbC34/mcNt+Wze+RNdDefRPGd1+zpZylg8ZKvDbOUkTanK/6Il7+1lUpKMwVluqcvos27zXodf/Da08M8lixmS2vFhuadNaL00NObBbX/F9rD+JTLXSuODbJDNUR7FGyJYMs4Iod/AVjVrs+2CAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters/AutogeneratedCommands-829",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "918"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:44:54 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "86"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_3.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_3.json
deleted file mode 100644
index 4001f8bc94..0000000000
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVWbW/bNhD+KwM/9Mti68WxlQgIBld2Cw92HFhKs3UYAko6yVwoUiApD27g/76jpKSOt2QDBrSADUi8Fz68e+6hHgnNd1RkkEdSFKxsFDVMChI+kqzRRlbrGoTWPGL1FlTnk3Dt+ST87fczUjHBqqaaC5pyyNFwo6SRmeQkJMky9u59ckYM18fhK5kDmmfzD9PbZUIOZySl2UNT90lIWFCuAVcZ+gvIjFQWDpyYFdD8RkEBChA+JtSQSZFTtbcpM47oQSX72po285vlIprG8wThZF1WPGVsFBOlttm1oTYW05NKilLmaeg4tDGyBAFYE8gzWVXoowcXA71Fz4Hr4m94nm7p+bCPGeSwGwowoR+4XnD27/He/4z334p3fsLGXRnVwDvMtI1lozK4ojk27Z2CmrOMxmCuqOFUD7xReZlPnlJjmZ4qEqvd16L8qNXu9cL8M5i2HdgtAzP8Yy7f9ccDdzTwJ4k3CUdBOHY/44Y50w93VCG6J4p8uF0uf72/m25W8xk6YJ/VvraNm5oNaINc27EckB3ken09R48Cd2kURLKqkcYp48zsP4HSLaPJxdCeq+QypTzq+BEDL1ZU0BLy2J4c934mWKlkUy8sIyYBnPv5OKV5Sidjb0QvsnERpAVmY0d2uAyC1A+CSRHQYOy6Ado5TYHrblg4Ew/28ZFskbcYtzWm1ljOjMsmb8vVl26INXVozZy2N87Od1ow2nkNidPzXTvT49ZEz63xL4kdGd7OCS+wJ98HhdPNuqOwf1LBzzLVz8BeAHkB4tj7eyPXgtZ6K81/wf3V92DF0lpm71f0D6lOWdnbXiwPJ2gQtLKj8FZba9roI2GsmTmVUgU5zUzEGQizlCXOIT2ytUrQ6mENWUfQV2l9XqDW2qAS/Ts97yJwiPjesEz3STCHsBKSQcy+2BOsPLcf8sX6JibhyHXd7t06fHxvV4a4Aqn+JHlTQa/dcTK9nk03VgAEykIkG2FI6KKoWBWKM8rbocX7Cqe+sQLz97uixgIwlPwdnFZGYzzM5J/ipeHQIbOoTrMd0AYcLxC7+G0OOzrYIzCpUM5IGNiXTvmue3LcxaS7ENeC779dAzoW9CBu4/v5NE7uvZbrX6SAxRskyknn0wd/xscfukglpYlAmX73Rbz5uFmvk1+87k4yTyGL2dJKvqFlL684vnh3tES2XyHdFX/a7103YBvsINUQ73HoK0y2TGJy+At5zs4TDAkAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters/AutogeneratedCommands-829",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "934"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2024-08-05+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:44:55 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "85"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionResource20240805::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_1.json
new file mode 100644
index 0000000000..fbb004c6a5
--- /dev/null
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfW/JBoShvGbCKiY+KpOvWaapMfAleHTuyHSZW8d93jbMOmFbtZdoDUvD1PT7X957jZ0LZlsoC2FDJNS8bTS1XkiTPpGiMVdWiBmmMGPJ6A9rvyYWJYpJ8/nJBKi551VRjSVcCGAZutbKqUIIkJJ9m0WNMLogV5jh9phhgeDR+l95Nc7K/ICtaPDV1C0KSNRUGcJXjfgmFVdrRgbOwBspuNaxBA9JHQAOFkozqnYMsBLIHne9qF1qOb6eTYZqNc6RTeFSsMrOay9IgustAQAsj/GFCHMa9y7B7GQ/ysJeEgyQOHzCVcfOU8e9w85Yk3bAT+pV7qvEeftb17m46/fR4ny5n4xGmIDm9q91pqV2CsXhBW84ASyLzxXyMO0qhVlQMPeEMxHpGJS2BZRuqGeK+VFxq1dQTvAHSv4Z+DEXUG/SjfhT3wn53HfXCAaLxo/jVddiP18XVAGj3ig26DOOCrkAY3z3B5ZP7fCYbvEjM21hbmyQICqEadslg26mULBVbdQpVBbTmAbWCmmAbBwcyJvgTk6BtgAnSxqoSJOBguSGrKiqZuYz7EXE9FIfGiTX27P+wCPzwBRp7ozS8VyvzQuyEyAmJ493/m7mRtDYbZf+G96+9e6deFxm9ndGvSn/Asw7CJ4NOSF5iJ8udPgYkrdyYv9bWmjbmSKk1t+fa1lALXhysJquh8EN4PLrd09GN3ejKpjpoAndHDqLEbG8pPh9lI3aWF6aFRERprDM3p1nEnkVhK+LJ4jZzEg5RwrAyH5RoKmjNIsvT+ShdOvFKlPRQNdKSJESLoFhzVlBxECUapKrqxtnF7+ZUa2AcPWYL55UbzIeR+iZPA3vPyxnLOdoeYyDQsdzivyitu3eEudLc7khy7f54j5q3rb7PiPfbhRS7f3W5vp/tkXfZ4zjN8sfoMKfflYTJK77WI35Pm/yAn298plbKDkHb9vRJtrxZLhb5RzelyN7+TBkux2k+md+414qWrT2i/NDXD0PqnjX/Zpz3c+sFssQOUQPZDkVbIeA0z8j+B+DlBXZdBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62ec158616125063f1508/clusters/AutogeneratedCommands-261",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "804"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "64"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_2.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_2.json
new file mode 100644
index 0000000000..2d1b249002
--- /dev/null
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVWbW/iRhD+K9V+uC8N+IXwIkvRiQPuRAUhYp1L76oqWtYDbLLedXfXVFzEf++s7eSA9tJK1ekkkIxn5vF4nnme5YmwbMcUh2yk1VpsSsOc0IokT4SX1ul8UYCyVo5EsQVT56TSRjFJfvv9guRCibzMJ4qtJGQYuDHaaa4lSUg6o9F9TC6Ik/a4fK4zwPB48n54O0vJ4YKsGH8siwaEJGsmLeBdgfkKuNPGtwNnYQMsuzGwBgPYPgJa4FplzOw9JJfYPZh0X/jQcnIzm46GdJJiO7xGxbekzgi1sR7dOuZrEZ7kWm10tkqCgJVOb0ABzgQyrvMcc2wrbtktZrbCED/t1fZhoNtNTSuDXVuBS+J+GPUv/r0++p/18Wv1wVsk7sqZEt4g0pbq0nC4YhmS9sZAIQVnFNwVc5LZ1sO60//j8Rkax/Q8EWp2X4fyszW7bw/mn5up6EC2HIzxi1hxGHdbYacVD9Kwm4SDJA4/4wMzYR+p+AIf3pGkE7bD+s4dM9jv89K8v53NPt3fDZfzyRhLkHmzLzyVQ7cE63D7diID3BdyvbieYMZG6hWTo3obKMj1nCm2gYz690Tcl3XaGF0WU89/rw+9GHjUHfSiXhR3w15nHXXDAaKJo/hlP+zFa345ANa5zAadDOOSrUDaWhpSqEd/+US2uKVYt3WusDg8LnWZVcNpBtXGCQasEEHFRLCLg6oZG3yrk6DZbhsMj4kYvRDRi4gXiKxUIdfIwI/pIqiVHRjkRhv4Ra/sS2MnjZw0cZz9ozu3ihV2q91/6ftr7sFbo4+M383ZgzYf8VmVq5JB22uriZ3cbvcwoFju1/w1WgtW2iMbLIQ7N85G25XDFcDrJTxe3c7p6sZ+dVWZV5rA7MhDbLC69uu6HmUj905w20AiovIWwcFrFrHnUdiIeLq4oV7CIUoYVvajlmUOjRPTdHg9Hi69eBVKeqRL5UgSokV4T6GcyUqUeProvCi9Xfzd+QsDmUAD38H5m1ush7H+U50GDnVf3ljO0Q4YA4nHgb/5PV6tc/ANC22E25Ok73/UHnXdUH1HSX2YLZTcf6/h1nw2j7yl95MhTe+jak+/aAXTV3ytS+qcpvgzXv5UVxqt3QiMa54+pcsPy8Ui/TWqTw/3XDIdz7wVO7ZprBGlh55eLaj/v1Afxudc7mpxLJEdZoHuUbA5gs1SSg5/AXvvbGu2CAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62ec158616125063f1508/clusters/AutogeneratedCommands-261",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "915"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:39 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "58"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_3.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_3.json
new file mode 100644
index 0000000000..03cbdf62f6
--- /dev/null
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_AutogeneratedCommands-261_3.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAMVW227bOBD9lQUf+rKxdXF8gYCgcGW38MKOA0tptl0UAU2NZSYUqSUpL9zA/75DSUkdt80WWKAFbEDiXHg4c+ZQD4RmOyoZZLGSG55XmlquJIkeCKuMVcWyBGmMiHm5Bd34pMIEIYn++nRGCi55URVTSdcCMjRcaWUVU4JEJJ0nwW1IzogV5jh8oTJA82T6dnw9T8nhjKwpu6/KNgmJNlQYwFWO/hKYVdrBgROzBppdadiABoSPCQ0wJTOq9y4lE4gedLovnWk1vZrP4nEyTREOa7LiKROrucyNy24sdbGYnhRK5ipbR55HK6tykIA1gYypokAf0wk7ZoueHd/HX3e9vRupbhvTyWDXlWCjcOgHw7P/jg/+Z3z4Urz3Ght3YXUFrzDTNlGVZnBBM2zaKw2l4IwmYC+oFdR07ja94d/3j6mxTI8VSfTuS1F+N3r3/cJ8G0zdDuyWhQn+MVfoh/2O3+uEo9TvR/4oCv2PuGHGzf0N1YjukSJvr+fzD7c349ViOkEH7LPel65xY7sCY5FrO54BsoNcLi+n6LHBXSoNsSpKpPGaC27370GbmtFk1HXnyoVaUxE3/EhAbBZU0hyyxJ0c934iWK5VVc4cIwZDGITAgv5oEAyCsO8Pepug748wGz+ynw/9Qbhh5yOgvfNs1MvQLugahGmGRXB57x4fyBZ5i3Fba0uD5WRCVVldrrZ0XaypR0vu1b3xdqFXgzHe95B4Ld+NNz5uTfzUmkFA3MiIek7EBnvya1B4zax7GvunNPyh1uYJ2DMgz0Ace/9q5EbS0myV/RHcX3wPTiydZfJmQe+UPmVla3u23B2gQdLCjcJLbS1pZY6EseT2VEo1ZJTZWHCQdq5ynEN6ZKuVoNbDElhD0JdoPagPnqN/o+dNBA6R2FvOTJsEc0gnIQwS/tmdYBH47ZDPllcJiXq+7zfvzuHdG7fSxRVYm/dKVAW02p2k48vJeOUEQKIsxKqSlkQ+iopToYRRUQ8t3lc49ZUTmK/vihILwFHyd3BaGYPxMFH/yOeGQ4PMoTrNdkAbCLxA3OLPOWzv4I7AlUY5I9HQvTTKd9mS4yYhzYW4lGL/8xrQsKAFcZ3cTsdJehvUXP+sJMxeIFGfND5t8Ed8/K2J1ErZGLRtd58lq3er5TL9M2juJPsYMpvMneRbmrfyiuOLd0dNZPcV0lzxp/3eNQO2wg5SA8keh77AZPM0IYd/AYfTaoYMCQAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62ec158616125063f1508/clusters/AutogeneratedCommands-261",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "933"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2024-08-05+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:40 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "71"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionResource20240805::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_provider_regions_1.json
index a7ef4b037a..7910e67e66 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeusolFGkw4E3rOJgiER7qmFpU5K0DxP/+2JF1Clt9piTL+d8yUlyQIwm3xI5Xwe0FxAhB+2VSqWD8ZbxLHwJIW/EPNnxcNPY8hiTlGKiGJE4b+Gd4Fkqcc+GTivs2iTckF7XapPXbTeyW5FOkUkFQuJU8JyGILCAHeWJfKOJnguhz7NEuUpkULsg0vWWQU1REO7IatZSsoNxFrtWjSqI5RTEVEdcq9lEdSSAaWEJLELH1WkoM6bOm6GJVCTZQkB/4BwhOaGMbBjMzg5FMISI6DXIOTnUUUJi0BkXwdr3gvnaQsf6DRMRJh+hVgW09B8z/a1WMKWJ+t6674/nM29YbuUv1uPJbD6opJ5pPYdKvS5QuwIylb9wpUUDz6A/3tQMCiaL+aC6k3dk6W7vyE4FWTTLyPNKVnleSXNPo1MypEr9Rr7ZXdCcSc13E0rfq/9Qpf4fQzN//WCrn9hdC7rGpF16cJ+3gqtr3GoWw8tHe0q6DIqQ4oqw4i9GjnX8Ba4gONoUBgAA",
+  "Body": "H4sIAAAAAAAAAJWUUWvCMBCA/0sefHJL42aVQhlFOjbYVKziYIjE9tqFpU1JUh8m/vfFiqjbaLPHXL7cfckl2SHOik+FvPcd+pCQIg99aF0qD+OYiyq5SWB7m4siE8nmNhY5piXDVHOq8LaHMymqUmF3AG4PYtIfusQlvb7j3qWk7wxNikppkAqXUmxZAhJLyJgo1AMrzFwCI1EV2teygs4JUX6wjDqagfRfidMpaQbjKvdJh2nI1RTk1ER84jioiyRwI6yAp2i/OgxVxfVxM6xQmhYxROwLjhG6pYzTDYfZ0aEOJpBSswZ5B4cuKmgOJuMiWodBNF8TtO9eMCnl6jfUa4GW4e9MP6vVTGOiUbAeheP5LHhptgoX6/FkNn9qpf7S+htq9DpBdy2QrfyJaywaBRb9CaZ2UDRZzJ/aO3lFNu72irxvIetmWXmeyTbPM2nvaXVKllSj32todxcMZ1Pz0YYy9+o/VKP/84udv3mw7U/sqgV9a3LQeHBvl4Krc5w49fD00R6SLqM6pIWmvP6LkUf237vvxioUBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e62ec158616125063f1508/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:46 GMT"
+      "Fri, 28 Mar 2025 05:08:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "77"
+      "65"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_1.json
index cdfec6b8ef..84cd498aa7 100644
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUPW+DMBBA/4tniBMTTMpWZereLq06HL6DoBgb+Uw6RPz3gqKmzVKxMN/Tuyf54yqMHThSOPrBRVFuE2ECQSQUpVBblafbLFX6dafLrCj3T+8iEe080wXtFeYVYAU632VwMHldVPU0t607syg/ruIUqJ7YU4w9l1Ia6wdMkS6bzrvGY7UxvpPQtxKiBZYXJZvgh57lP/ZAdlIy2VqMyQorpPEuQuso8H3bg/3B/AdeqeZ2PItaftB1ShAiVMD0xstyHvl1mnpa1nLjVmoI3hAzLeq4s+u0fJ3aSLbluKDllx0/E+Ggowl/HqJvaLrP8xdw9F0HDjklRanOdpPUh+Zlfv451Qj6oCCrFaGiAlEbpL0YvwGlYCjnUgQAAA==",
+  "Body": "H4sIAAAAAAAAALWUu27DIBRA/4XZDhgH4nqrMnVvl1YdCFw/FAwWF6dD5H8vVtS0WSovnu/RuUficSXaThghHP3kIqlZRnQAFcGQmnDGRc7KnFevTNSsqound5KRfpnJA0gOuhCVLGTBBZNlUwhWpbnt3RlJ/XElXYAmsV2MI9aUausnkxu47AbvWm9OO+0HqsaeqmgV0gunbfDTiPQfewCblAi2IXO2wQqqvYuqdxDwvu3B/mD+A29UczueVS0/6DYlRkV1UghvuC7nkd+maYR1LTduo4bgNSDCqo47u03LV9dHsD3GFS2/7PyZEacGSPjzFH0L6T4vX8DRD4NyBnPgkBd8n6Q+tC/L8xfQGCUrrsqGg+FwMEZqA3syfwNeSyhTUgQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:47 GMT"
+      "Fri, 28 Mar 2025 05:08:17 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2038"
+      "1752"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_1.json
deleted file mode 100644
index 75a43f5dc5..0000000000
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVTW/bOBD9KwueE0uWYyvRTbHdwAt/BJbSbFssAkoc2dxQpEBSLtzA/32HppI6LrrYS9GDAZnDeXzDmff4QijbUVkCGytZ8U2rqeVKkuSFlK2xql41II0RY95sQfs9uTD9iCRf/r4gNZe8buuppIUAhoF7rawqlSAJyedZ/ykiF8QKc5q+UAwwPJl+SB/mOTlckIKWz23TgZCkosIArnLcL6G0Sjs6cBbWQNm9hgo0IH0ENFAqyajeO8hSIHvQ+b5xofX0fj4bp9k0RzqlR8UqM6u53BhEdxkIaGGCP0yIwmh4GQ4uo1HeHyWDOBmGnzGVcfOc8W9wd0uSQdgL/coj1XgPr3V9eJjPPz09puvFdIIpSE7vG3daatdgLF7QjjPAkshytZzijo1QBRVjTzgDUS2opBtg2ZZqhrhvFW+0apsZ3gAZxXAVsWFBWUFHw/6AXpfDKi4qROMncbiJ4yKK41EV03gYhjHGBS1AGN89weWz+3whW7xIzNta25gkCEqhWnbJYNerldwoVvRKVQe04QG1gppgFwVHMib4GZOga4AJ0taqDUjAwXJDVtdUMnN5Hd0Q10NxbJyosGe/h0Xghy/Q2Bul4U9VmDdi74i8I3G6+3czN5I2Zqvs/+H9fe/BqddFJrcL+o/SH/Gso/DJdS8kb7F3y70RBiSt3Zj/V1sb2poTpTbcnmtbQyN4ebSarIHSD+Hp6LLT0b2qbhysbOujJnB330FsMNtbis9H2Yi95aXpIBFRGuvMzWkWsRf9sBPxbHWfOQmHKGEozEcl2ho6s8jydDlJ1068EiU9Vq20JAnRIijWnJVUHEWJBqnqpnV28aM5NRoYR4/ZwXnlBvNhor7K94GD5+WM5RztgDEQ6Fhu8VeUNjg4wlxpbvckid0f71HLrtWPGfF+u5Ji/6su1/ezO/Ihe5qmWf7UP87pNyVh9jNfu6pKRvyeLvkzfv7hM7VSdgzadqfPsvXderXK/+pjBrK3rynj9TTNZ8s791qBc/PjaLrHzL8U513ceVmssS/UQLZHqdYIM88zcvgXORYTWVMHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "806"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "488"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_1.json
new file mode 100644
index 0000000000..e67559e4e8
--- /dev/null
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e62ec158616125063f1508_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV224aMRD9lcrPgb0QCNq3LdCIikvEbpI2VRWZ9QBuvPbK9lKRiH/vGG9ToGrUl6oPSIvHc3zGM+f4hVC2pbIANlByxde1ppYrSZIXUtTGqnJegTRGDHi1Ae335MJEMUm+fL0gJZe8rMuRpEsBDAM3WllVKEESkk+y6DEmF8QKc5w+VQwwPBx9SG8nOdlfkCUtnuqqASHJigoDuMpxv4TCKu3owFlYA2U3GlagAekjoIFCSUb1zkEWAtmDzneVCy1GN5PxIM1GOdIpPCpWmVnN5dogustAQAtD/GFCHMbdVthpxf087CZhP4nDB0xl3Dxl/Bmu35OkE7ZDv3JPNd7Dz7o+3E4mnx/v08V0NMQUJKd3lTsttQswFi9oyxlgSWQ2n41wx1qoJRUDTzgDsZpSSdfAsg3VDHFfK15rVVdjvAHSu4JeDEXU7feiXhR3w15nFXXDPqLxo/jlVdiLV8VlH2jnkvU7DOOCLkEY3z3B5ZP7fCEbvEjM21hbmSQICqFq1mKwbZdKrhVbtgtVBrTiAbWCmmAbBwcyJvgTk6BpgAnS2qo1SMDBckNWllQy04p7EXE9FIfGiRX27P+wCPzwBRp7ozR8VEvzSuyEyAmJ493/m7mRtDIbZf+G96+9e6deFxm+n9JvSt/hWQfhk347JK+xk+V2DwOSlm7M32prRWtzpNSK23Nta6gELw5Wk1VQ+CE8Ht3O6ejGbnRlXR40gbsjB7HGbG8pPh9lI3aWF6aBRERprDM3p1nEnkZhI+Lx/CZzEg5RwrA0d0rUJTRmkeXpbJgunHglSnqgamlJEqJFUKw5K6g4iBINUpVV7ezid3OqNDCOHrOF88oN5sNQfZengb3n5YzlHG2PMRDoWG7xX5TW2TvCXGludyS5cn+8R82aVt9nxPvtXIrdv7pc38/myNvscZRm+WN0mNNnJWH8hq91id/TJD/g5zufqZWyA9C2OX2cLa4X83n+yU0psrc/UwaLUZqPZ9futQLn5ofRdI+ZfynOu7j1slhgX6iBbIdSLRFmkmdk/wP2yXNvUwcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62ec158616125063f1508/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "799"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "545"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/memory.json b/test/e2e/.snapshots/TestAutogeneratedCommands/memory.json
index 31f58a716e..93e87a7191 100644
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/memory.json
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/memory.json
@@ -1 +1 @@
-{"AutogeneratedCommandsGenerateClusterName":"AutogeneratedCommands-829"}
\ No newline at end of file
+{"AutogeneratedCommandsGenerateClusterName":"AutogeneratedCommands-261"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_1.json
index 9d75951284..4f1f2b76fb 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/0uuu1HTrsFcOWmVwihDFEHxIkveski+SFK0Ff+7KcNtbHfhnOeck+QHsSHurZcTiEYzqRBFvfQhGqZhqdjhcAffTDsFS241ys4iLwH8w4x3iTqPXlEbdoT+WxPDrRu33kbgUVrTGLZTIBDtmQqQIQEK4iwdFTDcj25m1/EJQrxMWFODZkZsrZJ8bCNoRM2gVIacvIKdt59puE0KqgiUWKyKW0J2mJCqJ4yUXOB0R592rIdXaYT9qtkYEM0zFPgexJDqTlPJeP9ITmRxfmbTre83bfeYKgYnkibqg4FzvFrkxQJXzzcVLQgt8dsJmj8rQWZSdtIW0O8fg1VYsqMBAAA=",
+  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/0uuu5Fl9INeOWmVwihDFEHxIiZvWSTJG5IU7cT/bspwG+4unPOcc5J8Ez7GPXp1ANkarjSpyaB8iJYbWGp+PNzAFzdOw1KgIdlF5CmAv5vxPlGX0Stqy0/QX2tiBLpp5zGCiApta/m7BknqgesAGZGgIc7SSQEr/ORmdhMfIMT/CbQNGG7lDrUSUxfBkNqOWmfEqSvYefxIw11SSFFCwaAq86pYFSuW02I9UBA03dGnHfTwrKzEz4ZPgdQ0I0HsQY6p7jyVjNe35EQe52e2/eZ22/X3qWJ0MmmyORqMsnxB1wtWPdK8pmXN2MsZmj8rQfag8WAQyM8vz4kg9KMBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d53977b2776f7a74cd2/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e8758616125063f0ec0/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:42 GMT"
+      "Fri, 28 Mar 2025 05:07:22 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "50"
+      "37"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_2.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_2.json
index 3e8a29d708..ba803c96fd 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQ3UrDQBCF32Wu05ImJi17ZTERAiJFqoLixXR3Qlf2j80GTcR3d0OxLe3dcOY75+zOD2Af9tbLkUStUSpg0ErfBYOa5goPwy19o3aK5txqSM4szx35+wl/jNS59Yp6wCP0nxoZbt2w8TYQD9Ka2uBOkQDWouooAUGKwiQdFTLcD25i1+GJunDpsKYijUZsrJJ8aAJpYKZXKgEnr2Dn7WcsbqIC5ZJuMlEWKHZYFoscV7xoRSriG33ssZ5epRH2q8KhA5Ym0PE9iT7Gnari4v0jbgKG6Zvru23zUseA3omoiOogZ2lWzNJ8lpXbRcnyJStWbydoOlWEzKjsqC3B7x8wcFZhoQEAAA==",
+  "Body": "H4sIAAAAAAAAAGWQX0vDMBTFv0ueu5Fl9A99ctgKBZEhU0HxISa3LJLkhiRFW/G7mzLcxvZ2Ofd3zknuD+FD3KNXE8jWcKVJTXrlQ7TcwFLzw3AD39w4DUuBhmRnlqcA/m7GHxJ1br2i7vkR+k9NjEA3bj1GEFGhbS3/0CBJ3XMdICMSNMRZOipghR/dzG7iI4R46UDbgOFWblErMXYRDKntoHVGnLqCncfPVNwlhRQlFAyqMq+KVbFiOS3WPQVB0xt96kEPL8pK/Gr4GEhNMxLEHuSQ4k5VafH2njaRx/mbm9td99ymgMHJpMjmIDPK8gVdL1i1o3lNy5qx1xM0nypBdtI4GQTy+weAiG5goQEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d65adba6513a8c5fd0d/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e8758616125063f0ec0/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:03 GMT"
+      "Fri, 28 Mar 2025 05:07:26 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "45"
+      "39"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_3.json
similarity index 61%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_3.json
index 79b8ce1cb0..e0d118e547 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/0uuu9HvSq6ctEphlCGKoHjxLnnLIvkoSYq24n83ZbgNdxfOec45Sb4JjP5grJiRNwqEJJT0wjqvQeFawvFwi1+gBolrZhSJLiLPDu39gneBuoxeUVs4QX+tgWFmmHbWeGReGN1o2EvkhPYgHUaEo0S/SCcFNbPTsLAb/4jO/08YXaMCzXdGCja1HhWhepQyIoO4ggdrPsJwGxRSVpinPK+A76EskgxuWNHnyXJHG3aMxRehufmsYXKExhFx7IB8DHXnqWC8vQfHg1+e2XSbu23bPYSKceBB4/XRSOO0WMXZKi2fkpJmFc3i1zO0fFaA9CzNrAySn18j+Pp+owEAAA==",
+  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/8t73Y2sox/kykGnFGQU2RAUL2LylkXyUdIUbcX/7lum22B34ZznnJPkG8QQjz7oCdXWCm2AQ6tDH52wuDTidLjDL2E7g0vpLSRXkUOP4X7Gd0RdR2+oR3GG/luJkb4bm+Ajyqi92zrxblABj2HABBQajLMCvBWmJwWdDGM3o5v4hH08B/587yq0wqnGGy3HOqIF7gZjEuj0DdwF/0G7NSmQF5inWBZZma/yVZqxfN0ylIyuGGjHB3zWTvnPSow9cJZAL4+oBqq7TJHx+kZOFHF+5aGpNvt690AVQ6dIU9XJSFmaLdh6kZZ7lnFW8DR/uUDzXxHkJuMn6xF+fgHAZ5q4ogEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e8758616125063f0ec0/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "274"
+      "280"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:30 GMT"
+      "Fri, 28 Mar 2025 05:07:26 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "40"
+      "37"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=241ebaaa923f8976e089f60cd8094828546f28c7; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_4.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_4.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_4.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_4.json
index e86abe7f7b..f208129211 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_4.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/8t73Y2un5Irh61QEBkyFZRdvEveskg+SpqirfjfTZlug92Fc55zTpJvwMEfrJMTiVqjVMCgla73BjUtFR4Pt/SFulO05FZDdBF57sndz/hjoC6jV9QDnqD/1sBw240bZz1xL62pDe4VCWDeDRSBIEV+VoC1qPqgkOFu7GZ07Z+o96fAn29NRRqN2Fgl+dh40sDMoFQEnbyCO2c/wm4TFChKyhKRlSj2WOSrFG943mar+You7FhHr9II+1nh2AOLI+j5gcQQ6s5TwXjfBcejn1+5vts2L3UoGDoRFFEd5SRO8kWcLpJiuypYWrI0eztD808FyEzKTtoS/PwCgBPvq6ABAAA=",
+  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/8t73Y2sox/kymErFESGTAXFiyx5yyL5KGmKtuJ/9y3TbbC7cM5zzknyDWKIBx/0hKq2Qhvg0OrQRycsLo04Hm7wS9jO4FJ6C8lF5KnHcDfjD0RdRq+oe3GC/luJkb4bt8FHlFF7VzuxN6iAxzBgAgoNxlkB3grTk4JOhrGb0U18xD6eAn++dxVa4dTWGy3HJqIF7gZjEuj0FdwF/0G7DSmQF5inWBZZma/yVZqxfN0ylIyuGGjHB3zRTvnPSow9cJZALw+oBqo7T5Hx9k5OFHF+5eZ21zzXVDB0ihRVHeWUpdmCrRdpuWMZZwVP89czNP8UQW4yfrIe4ecXL7qUWaABAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e8758616125063f0ec0/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:39 GMT"
+      "Fri, 28 Mar 2025 05:07:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "36"
+      "35"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/POST__api_atlas_v2_groups_1.json
index dac4a91ec2..38cf0415cd 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUPWvDMBBA/4tmK7Llr+C1U/d2aelwls6OqCwJSU4Jwf+9CqFpvRQvnu/x7sHBXYnQc4jon+xsIunyjAiPEFGSjvCc1zQvKW9eiqYr267M30hG1G3WtFhxWbUge2jqooSjqIeqwDTXynwG0r1fycnjkNhTjC50jAltZ0klng+TNaOV/UHYiYFTDKKGwM6cjd7OLrB/7B51UgbUA1myHVYwYU0EZdCHx7aVfWX+A+9Ucz/PppYfdJ8SCRF6CPgatuWs+X2aHG5ruXM7NXgrMATc1PFg92n5OqmIWoW4oeWXXT4yYmDChAvrLikyoojKGpo4pxUYgdRZrcSFIkdatG3yWz8+3z5BjYOE5sihHDhKjq2UjZBYkeUbvLlyj10EAAA=",
+  "Body": "H4sIAAAAAAAAALWUsW7DIBBA/4XZBIxr7Hrt1L1dWnUgcLZRMSDAqaLI/16iqGm9VF4839O7J510FyTNHBOEJzfbhDpaIBlAJFCoQ4yyGtMKs/aF1h1tOsbeUIH0dcYb4Azapm55yUtWU171FCTNc6PtZ0Td+wWNAfrMjin52BEijZsVVnA6TM4OTh0P0k1EeE1EMiKSEyNDcLOP5B97AJOVEUyPlmKHFUQ6m4S2EOJ928q+Mv+Bd6q5nWdTyw+6T4kSSRxFhNe4LWfN79PkYVvLjdupITgJMcKmjju7T8vXqBMYHdOGll92+SiQFRNkXDp/zpEJZNLO4sx5o4WVgL0zWp4xMMCPbZn9LgzP109QQ68Eb5moegaKQaMUlwoe0PINZdsxEF0EAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:27 GMT"
+      "Fri, 28 Mar 2025 05:07:19 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2192"
+      "2149"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_1.json
index 1161dc3cdb..da565f219d 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNDdhZGJhNjUxM2E4YzVmNDFlIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzozMFoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNjJlODc1ODYxNjEyNTA2M2YwZWMwIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yOFQwNTowNzoyMloiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e8758616125063f0ec0/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:30 GMT"
+      "Fri, 28 Mar 2025 05:07:22 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "172"
+      "127"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_2.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_2.json
index 649626715d..6c7d2c54e1 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6dHJ1ZSwiZGVsZXRhYmxlIjpmYWxzZSwiZW5jcnlwdGlvbkF0UmVzdEVuYWJsZWQiOmZhbHNlLCJvbkRlbWFuZFBvbGljeUl0ZW0iOm51bGwsInBpdEVuYWJsZWQiOmZhbHNlLCJwcm9qZWN0SWQiOiI2N2U0MmQ0N2FkYmE2NTEzYThjNWY0MWUiLCJyZXN0b3JlV2luZG93RGF5cyI6MCwic2NoZWR1bGVkUG9saWN5SXRlbXMiOltdLCJzdGF0ZSI6IlVQREFUSU5HIiwidXBkYXRlZERhdGUiOiIyMDI1LTAzLTI2VDE2OjM3OjM0WiIsInVwZGF0ZWRVc2VyIjoibnpsb3ptb2UifQ==",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6dHJ1ZSwiZGVsZXRhYmxlIjpmYWxzZSwiZW5jcnlwdGlvbkF0UmVzdEVuYWJsZWQiOmZhbHNlLCJvbkRlbWFuZFBvbGljeUl0ZW0iOm51bGwsInBpdEVuYWJsZWQiOmZhbHNlLCJwcm9qZWN0SWQiOiI2N2U2MmU4NzU4NjE2MTI1MDYzZjBlYzAiLCJyZXN0b3JlV2luZG93RGF5cyI6MCwic2NoZWR1bGVkUG9saWN5SXRlbXMiOltdLCJzdGF0ZSI6IlVQREFUSU5HIiwidXBkYXRlZERhdGUiOiIyMDI1LTAzLTI4VDA1OjA3OjI2WiIsInVwZGF0ZWRVc2VyIjoibnpsb3ptb2UifQ==",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e8758616125063f0ec0/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "418"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:34 GMT"
+      "Fri, 28 Mar 2025 05:07:26 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "151"
+      "127"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_3.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_3.json
index 61ee14bf4a..8129008f10 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e62e8758616125063f0ec0_backupCompliancePolicy_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNDdhZGJhNjUxM2E4YzVmNDFlIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJVUERBVElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzozOVoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNjJlODc1ODYxNjEyNTA2M2YwZWMwIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJVUERBVElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yOFQwNTowNzozMVoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e8758616125063f0ec0/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:39 GMT"
+      "Fri, 28 Mar 2025 05:07:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "133"
+      "117"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_1.json
index b61b01afc2..a803cab6d3 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/8t73Y2un5IrB51SkFFkQ1C8eJe8ZZF8lDRFW/G/mzLdBrsL5zznnCTfgIM/WicnEhuNUgGDVrreG9S0VHg63NMX6k7RklsN0VVk35N7mPFtoK6jN9QTnqH/1sBw242Ns564l9ZsDB4UCWDeDRSBIEV+VoC1qPqgkOFu7GZ07Z+p9+fAn29NRRqNaKySfKw9aWBmUCqCTt7AnbMfYbcOChQlZYnIShQHLPJVinc8b7PVfEUXdqyjF2mE/axw7IHFEfT8SGIIdZepYLy9B8ejn1+5b6r1rt4+hoqhE0ET1clI4iRfxOkiKXargqUlS7PXCzT/VYDMpOykLcHPLywWQDKiAQAA",
+  "Body": "H4sIAAAAAAAAAGWQUUvDMBSF/0ueu5G2tpt5ctIqhVGGKILDhyy5ZZEkN6Qp2on/3ZThNtxbOOc75yT5JnwIe/TqALI2XGnCSKd8Hyw3MNf8eLiDL26chrlAQ5KLyEsP/mHC20hdRq+oNT9Bf62REejGjccAIii0teU7DZKwjuseEiJBQ5ikkwJW+NFN7Co8QR/+J9BWYLiVG9RKjE0AQ5gdtE6IU1ew8/gRh5uokHIBZQa3ebEs0zLNClrmXZre7OIdfdxBD6/KSvys+NgTRhPSiz3IIdadp6KxfY9O4GF6Zt2u7tdN+xgrBiejJqujkdGsmNF8li2facHoguX52xmaPitC9qDxYBDIzy9ORzDBowEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e9358616125063f114b/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "279"
+      "277"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:35 GMT"
+      "Fri, 28 Mar 2025 05:07:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "61"
+      "28"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=241ebaaa923f8976e089f60cd8094828546f28c7; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_2.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_2.json
index b62c0981ec..c4091c0eef 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQX0vDMBTFv0ueu9G1tht5ctIqhVGGKILiw13uLYvkH2mKduJ3N2W4DfcWzvmdc5J8MxjC3np5IKw1SMU466TvgwFNcwXHwy19gXaK5sJqllxEnnvy9xPeRuoyekVt4AT9tUZGWDduvQ0kgrSmNrBThIx3oHpKGJKiMEknhYzwo5vYdXikPvxPWFORBoNbq6QYm0CacTMolTAnr2Dn7UccbqLCyiXdZFgWgDsoi0UOK1F0mGK8o4871tOLNGg/Kxh7xtOE9WJPOMS681Q03t6jEyBMz6zb9d2maR9ixeAwalgdjSzNilmaz7LyaVHyfMmL1esZmj4rQuag7EFbYj+/uboitqMBAAA=",
+  "Body": "H4sIAAAAAAAAAGWQX0vDMBTFv8t97kba2m7myWErFESGTAXFhyy5ZZH8I0nRTvzupgy34d4u5/7OOcn9BjbEnfVyj6LVTCqg0EsfomEa54odhhv8YtopnHOrITuzPAX0dxP+kKhz6wV1z47QX2piuHXj2tuIPEprWsO2CgXQnqmAGQhUGCfpqKDhfnQTu4qPGOJ/hzUNambE2irJxy6iBmoGpTJw8gJ23n6k4i4pUC+wLvC6rJZ1XudFReqyz/OrbXqjTz3W44s0wn42bAxASQaB71AMKe5UlRZv72kTWZy+ubrddM9tChicSIpoDnJBimpGylmx3JCKkgUty9cTNJ0qQWav7F5bhJ9f1xf+PKEBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d65adba6513a8c5fd0d/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e9358616125063f114b/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:59 GMT"
+      "Fri, 28 Mar 2025 05:07:37 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "52"
+      "35"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/POST__api_atlas_v2_groups_1.json
index d2088711c1..0ff89a7962 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsU7DMBBA/8VzXAcnsSErEzssIIaLfWktHDvyOUWoyr+TqqLQBWXJfE/vnnTSnZjxE2VMj3EKmbVlwUxCyGhZy2QpG15WXKrnO9VWuq3lKyuYO8+UxlrapnrQupNaq16Dro2Vy9y78EGsfTuxQ8J+YQ85j9QKYXycLLd43A0x7KPtdiYOAkYnIHsgcZRin+I0kvjHntAvSkLfs7nYYIUwMWRwARNdt93Yb8x/4I1qLudZ1fKDblNiIUMHhC+0LueW36ZpxHUtF26jhhQNEuGqjiu7TcvnwWX0jvKKll92fi9YgAEX3CKZ5DrkCzF6B8EgH6N35oujRK5LtZhj2j+df0CDvQV1L6HqJVqJ2lplLNZs/gY4oOzwVwQAAA==",
+  "Body": "H4sIAAAAAAAAALWUsW6DMBBA/8UzjsHEhrJ26t4urToY+yBWjY18JlUV8e8lipqWpWJhvqd3TzrpLkS7CRPExzD5RJo8IzqCSmBIQ3jOBc1LyuvnXDR51ZTlK8mIvc5kBZLDQylqWciCi1yWXVEc22XurP9A0rxdyClCt7CnlEZsGNMuTIYaOB+G4Ptg2oMOA1OjZSo5hezMWR/DNCL7xx7BLUoE15E522EF08EnZT1EvG9b2VfmP/BONbfzbGr5QfcpMSqpViG84LacNb9P0wjbWm7cTg0xaECETR13dp+Wz5NN4CymDS2/7PyeEa8GWHADqKNtgS7E6KzyGugYnNVfFDhQIcViDrF/uv4AAZ1Rsuaq7DgYDpUxUhs4kvkb/+ZRLVcEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "295"
+      "296"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:39 GMT"
+      "Fri, 28 Mar 2025 05:07:31 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2847"
+      "1703"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e42d5b977b2776f7a74e75_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e42d5b977b2776f7a74e75_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_1.json
index d36e3c2536..19d76a8ef4 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e42d5b977b2776f7a74e75_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e62e9358616125063f114b_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNWI5NzdiMjc3NmY3YTc0ZTc1IiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzo0OVoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNjJlOTM1ODYxNjEyNTA2M2YxMTRiIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yOFQwNTowNzozM1oiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d5b977b2776f7a74e75/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e9358616125063f114b/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:49 GMT"
+      "Fri, 28 Mar 2025 05:07:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "137"
+      "117"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/POST__api_atlas_v2_groups_1.json
index 3bb80171a7..060146bbab 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUMU/DMBCF/4vnuC5uEtOsTOywgBgu9ktr1bEj2ylCVf87qSoKXVCWzO/Tu0863Z2YdmPKiE9h9Jk164LpCMowrGFyLSu+3nBZvzzUzUY15faNFcxeslqhlKZqt0q1Uqm6U6RKqGrKnfWHxJr3E9tHdBO7z3lIjRDahdFwg+OqD34XTLvSoRc0WEHZURJHKXYxjEMS/7RHuKkywXXsXCwwQujgM1mPmG7T7trvmv/AC9lc1zPL5QddxsRQppYSXtM8nXt+GacB81yu3EIOMWikhFkeN3YZl8+9zXA25Rkuv+z5o2Ceekw4PLUOfMoHZ8lr8CE4q784JHi1vRxgiLvnyweo0BmqHyVtOgkjoYyptUHJzt9be1SYVQQAAA==",
+  "Body": "H4sIAAAAAAAAALWUsW6DMBRF/8UzjpEhEFg7dW+XVh1e7EtixbGRbVJVEf9eoqhpWSoW5nt03pEs+cqUHWJCePKDS6zNM6YCKEGzlslcbnlecLl7ybdtXrdF88YyZm5bVaOSaJo6r2Snyh2oKHXZ0LRb406Rte9XdgzoJvaYUh9bIZT1g+Yal83Zu4PX+43yZ0G9EZQsRXGR4hD80Efxjz3ATsoI27ExW+GEUN4lMg4hPq7N7DPzH3ilmvvzLGr5Qdcp0ZRoTxGvcVnOnF+nqceylju3UkPwCjFiUceDXafl82gSrIlpQcsvO35kzNEZEw5Hews+7b015BR4761RXxwSvKgmrQ+H59sHsEWnqdpJKjoJLVFrXSmNko3fSGbi+FQEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "295"
+      "293"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:47 GMT"
+      "Fri, 28 Mar 2025 05:07:37 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1566"
+      "1802"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e62e997062fc48ea34d49a_backupCompliancePolicy_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e62e997062fc48ea34d49a_backupCompliancePolicy_1.json
index cfaf7ef816..c772fbd741 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e62e997062fc48ea34d49a_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNjVhZGJhNjUxM2E4YzVmZDBkIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzo1OFoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNjJlOTk3MDYyZmM0OGVhMzRkNDlhIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yOFQwNTowNzozOVoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d65adba6513a8c5fd0d/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e997062fc48ea34d49a/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:58 GMT"
+      "Fri, 28 Mar 2025 05:07:39 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "169"
+      "110"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
deleted file mode 100644
index 4d6531a351..0000000000
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAGWRUU/CMBSF/0ufB9kGW3VPYkCzhBBiQBOND3frXajp2tl16iD8d28lOiJvzel3zzm9PTDo3M5YuUexqEEqlrFK2tZpqHGs4HS4wS+oG4Xj0tQsOBvZtmjvPL4i6nz0glrCH/TrSkxpmn5tjcPSSaMXGgqFgmUVqBYDJlCh89Kfgrq0fePZmXvA1v2fMHqONWixNkqWfe6wZpnulApYIy/gxpo3Cs5JYSnHaSwScc15EXOeVhz4tIoT6mgpx1h8klqYzzn0LcvCgLXlDkVHdkMUXbwcWGXxvaOefa4d2g+gjUbBoG76xu9gZzqrenKXQ3oagiggTaIJXJVJVST4k+5Q+wdvtXSECl/gTH4E1ZFhdHylTg6cN1+sZrfLfHVPXNcI0sT8dBGHcTIKJ6M43URpNuFZEj8PkP8mgvRemX1tkB2/AbQHYIAdAgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f25/backupCompliancePolicy",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "342"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-10-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:52 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "57"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiDiskBackupDataProtectionResource::getDataProtectionSettings"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
deleted file mode 100644
index d464557f16..0000000000
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAGWRUU/CMBSF/0ufB9kGW3VPEsFkiTHEACYSH+7Wu1DTtbPr1EH4795KZETemtPvnnN6e2DQuZ2xco9iUYNULGOVtK3TUONYwelwh99QNwrHpalZcDGybtE+ePyJqMvRK+oRztCfKzGlafqlNQ5LJ41eaCgUCpZVoFoMmECFzktnBXVp+8azM/eMrfs/YfQca9BiaZQs+9xhzTLdKRWwRl7BjTXvFJyTwlKO01gk4pbzIuY8rTjwaRUn1NFSjrH4IrUwX3PoW5aFAWvLHYqO7IYoutgeWGXxo6Oefa4d2k+gjUbBoK76xu9gZzqrenKXQ3oagiggTaIJ3JRJVST4m+5Q+wevtXSECl/gQt6A6sgwOr5RJwfOm8/uV/lmQVTXCFLE/CTHYZyMwskoTldRmk14lsSvA+Q/iSC9V2ZfG2THH3ktnuUbAgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f25/backupCompliancePolicy",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "339"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-10-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "55"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiDiskBackupDataProtectionResource::getDataProtectionSettings"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_1.json
new file mode 100644
index 0000000000..d9e1d61e1d
--- /dev/null
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAGWRW08CMRCF/0ufV1KW+z6JAc0mhBADmmh8qO1sqOll7bZqIfx3pxJhlbfm9JtzTqd7woLfWid3IOaaSUUKUknXeMM0dBQ7Hq7hi+laQYdbTbLWyKYBd5vwJVLt0QtqwU7Qrysy3NZx5awH7qU1c8NeFQhSVEw1kBEBCnySTgoY7mKd2Km/h8b/n7BmBpoZsbJK8lh60KQwQamM1PICrp19w+ASFTIcwTCHCR/RYV7x/hhYry8GVGBHhznWwaM0wn7OWGxIQTPS8C2IgHbnKLx43pPKwXvAnrE0HtwHw412s7O6jnXawdYGpyK6y1a6+Js+oT/pHkx68MZIj6hIBVryA1MBDbuHF+zkmU/m8+X0ZlEu75ALtUBNzI4XOc0HV7R3lY/XdFDQUdHvPp2h9E0ImZ2yO22BHL4BJlx4bx0CAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e9c7062fc48ea34d50d/backupCompliancePolicy",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "332"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-10-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:41 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "54"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiDiskBackupDataProtectionResource::getDataProtectionSettings"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_2.json
new file mode 100644
index 0000000000..244e4e2ffa
--- /dev/null
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_2.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAGWRW08CMRCF/0ufF1KW+z5JBJNNjCEGMJH4UNvZUNOb3a5aCP/dqURY5a05/eac0+mBsCbsrJd7EAvNpCIFqaSvg2EauoqdDjfwxbRT0OVWk6w1sq7B3yX8Aan26BV1z87Qrysy3Lq49DYAD9KahWGvCgQpKqZqyIgABSFJZwUM99EldhYeoQ7/J6yZg2ZGLK2SPJYBNClMo1RGnLyCnbdvGFyiQkZjGOUw5WM6yis+mADrD8SQCuzoMcd6eJJG2M85izUpaEZqvgPRoN0lCi+2B1J5eG+wZyxNAP/BcKO97KKuoks72NnGq4juspUu/qZP6U96AJMevDYyICpSgZa8YapBw97xBTsFFpL57HZVbhZINU6gIuYnOaf5sEP7nXyyosOCjotB7/kCpU9CyOyV3WsL5PgNdZux7hsCAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e9c7062fc48ea34d50d/backupCompliancePolicy",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "329"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-10-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:46 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "36"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiDiskBackupDataProtectionResource::getDataProtectionSettings"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/POST__api_atlas_v2_groups_1.json
index 5e14be447e..cec63ec1ec 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsU7DMBCG38VzUpdrE0NWJnZYQAwX+5JYOHbkc4pQlXcnUUWhC8oSyZKH/9N/n3Syz0K7kRPFxzD6JKp9JnQkTGREJWAPRb4/5FA+35XVQVUFvIpM2CUrFR3BFOZBqRqUKhuF6thAMefO+g8W1dtZdJGame1SGriSUrswmtzQadcH3wZT73ToJQ5WYnLI8gSyjWEcWP7THsnNlUyuEVO2wQipg09oPUW+Trtpv2n+A29kc1nPKpcfdBsTgwlrZHrhdTq3/DZOA61zuXAbOcSgiZlWeVzZbVw+O5vIWU4rXH7Z6T0THnua8TkYnEWvKR+Cs/prvqxPy+kpEqcQKSegHNTyGENsn5bfoKDGYHkPeGiADJAyptSGjmL6Bu5X5qVhBAAA",
+  "Body": "H4sIAAAAAAAAALWUPW/DIABE/wuzHSj+Srx26t4urToQOCeoGCzAqarI/71YUdN6qbxYQmK4p7snIXEl0owhwj+60UbSsoxIDxGhSEs441XOipzvn1nVsqYtH15JRvSc1Q1qjoNsWM07We4hilJVTKXcaPsRSPt2JWePLrHnGIfQUiqNG1WucNn1zp6cOu6k66kYNBXRiEAvnJ68G4dA/2n3MKkywHRkyjaYoNLZKLSFD/e1Rfui+Q+8kc3teVa5/KDbmCgRxVEEvIR1Okt+G6cB61xu3EYO3kmEgFUed3Ybl8+zjjA6xBUuv+z0nhEreiQ8BYPRwkrkgzNafqVL2zifHh4hOo8cHPnhUKQN509P829QoVOi3nNRdByKo1Gqlgolmb4BASHr+WEEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "303"
+      "302"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:49 GMT"
+      "Fri, 28 Mar 2025 05:07:40 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2564"
+      "1495"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_1.json
index 64a9f013f9..a9cfc62850 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNWQ5NzdiMjc3NmY3YTc0ZjI1IiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbeyJmcmVxdWVuY3lJbnRlcnZhbCI6MSwiZnJlcXVlbmN5VHlwZSI6ImhvdXJseSIsImlkIjoiNjdlNDJkNjBhZGJhNjUxM2E4YzVmYjVlIiwicmV0ZW50aW9uVW5pdCI6ImRheXMiLCJyZXRlbnRpb25WYWx1ZSI6MX1dLCJzdGF0ZSI6IkVOQUJMSU5HIiwidXBkYXRlZERhdGUiOiIyMDI1LTAzLTI2VDE2OjM3OjUyWiIsInVwZGF0ZWRVc2VyIjoibnpsb3ptb2UifQ==",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNjJlOWM3MDYyZmM0OGVhMzRkNTBkIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbeyJmcmVxdWVuY3lJbnRlcnZhbCI6MSwiZnJlcXVlbmN5VHlwZSI6ImhvdXJseSIsImlkIjoiNjdlNjJlOWQ3MDYyZmM0OGVhMzRkNTkwIiwicmV0ZW50aW9uVW5pdCI6ImRheXMiLCJyZXRlbnRpb25WYWx1ZSI6MX1dLCJzdGF0ZSI6IkVOQUJMSU5HIiwidXBkYXRlZERhdGUiOiIyMDI1LTAzLTI4VDA1OjA3OjQxWiIsInVwZGF0ZWRVc2VyIjoibnpsb3ptb2UifQ==",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f25/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e9c7062fc48ea34d50d/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "541"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:52 GMT"
+      "Fri, 28 Mar 2025 05:07:41 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "113"
+      "96"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_2.json
similarity index 75%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_2.json
index e5e11000df..c8d6a6f74c 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e62e9c7062fc48ea34d50d_backupCompliancePolicy_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjp0cnVlLCJwcm9qZWN0SWQiOiI2N2U0MmQ1ZDk3N2IyNzc2ZjdhNzRmMjUiLCJyZXN0b3JlV2luZG93RGF5cyI6MSwic2NoZWR1bGVkUG9saWN5SXRlbXMiOlt7ImZyZXF1ZW5jeUludGVydmFsIjoxLCJmcmVxdWVuY3lUeXBlIjoiaG91cmx5IiwiaWQiOiI2N2U0MmQ2MGFkYmE2NTEzYThjNWZiNWUiLCJyZXRlbnRpb25Vbml0IjoiZGF5cyIsInJldGVudGlvblZhbHVlIjoxfV0sInN0YXRlIjoiVVBEQVRJTkciLCJ1cGRhdGVkRGF0ZSI6IjIwMjUtMDMtMjZUMTY6Mzc6NTZaIiwidXBkYXRlZFVzZXIiOiJuemxvem1vZSJ9",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjp0cnVlLCJwcm9qZWN0SWQiOiI2N2U2MmU5YzcwNjJmYzQ4ZWEzNGQ1MGQiLCJyZXN0b3JlV2luZG93RGF5cyI6MSwic2NoZWR1bGVkUG9saWN5SXRlbXMiOlt7ImZyZXF1ZW5jeUludGVydmFsIjoxLCJmcmVxdWVuY3lUeXBlIjoiaG91cmx5IiwiaWQiOiI2N2U2MmU5ZDcwNjJmYzQ4ZWEzNGQ1OTAiLCJyZXRlbnRpb25Vbml0IjoiZGF5cyIsInJldGVudGlvblZhbHVlIjoxfV0sInN0YXRlIjoiVVBEQVRJTkciLCJ1cGRhdGVkRGF0ZSI6IjIwMjUtMDMtMjhUMDU6MDc6NDZaIiwidXBkYXRlZFVzZXIiOiJuemxvem1vZSJ9",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f25/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62e9c7062fc48ea34d50d/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "540"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:07:46 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "116"
+      "105"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_1.json
index 9a29b03708..fb82f8f30e 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQX0vDMBTFv0ueu1HTrsE8OWyFgsiQqaD4kCW3LJJ/pCnait/dW4bbcG+Xc3/nnOR+EzGkvY96AtVYoQ3hpNOxT05YWBpxGG7gS9hgYCm9JdmZ5amHeDfjD0idWy+oe3GE/lKRkT6Mm+gTyKS9a5zYGVCEd8L0kBEFBtIsHRVwMo5hZtfpEfr03+FdDVY4tfFGy7FNYAl3gzEZCfoCDtF/YHGLCqkYlFStimvGdpSxqmOClVJRfGPEHh/hRTvlP2sx9oTnGenlHtSAcacqXLy94yaJNH9zfbttnxsMGIJCRdUHmeZ0tciLBa22VxUvGC/p6wmaT4WQm4yfrAfy8wtmAXYzoQEAAA==",
+  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/0uuuxG6ftErJ61SGGWIIihevCZvWSRfJCnaiv/dlOE23F045znnJPkmMIaDcWJG3ioQktRkEM4HDQrXEo6HG/wCZSWumVEkuYg8eXR3C95H6jJ6Re3gBP21RoYZO+2dCciCMLrV8C6Rk3oA6TEhHCWGRTopqJmb7MJuwwP68D9hdIMKNN8bKdjUBVSk1qOUCbHiCrbOfMThLiqkKLFIEdKSFunAsgphk/GcVfGOLu4Yh89Cc/PZwORJTRPi2QH5GOvOU9F4fYtOgLA8s+23t7uuv48Vo+VR483RSGmar+hmlVaPNK9pWWflyxlaPitCepZmVgbJzy+I/d+fowEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d53977b2776f7a74cd2/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62ea27062fc48ea34d5c8/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:47 GMT"
+      "Fri, 28 Mar 2025 05:07:48 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "72"
+      "36"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_2.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_2.json
index ea76cb8ac7..d1a1231f3d 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQW0sDMRCF/0uet2XvK/tkcVdYEClSFRQfpsksjeRGkkW34n83odiW9m04851zkvkhMPmdtnyPrJfABWnJyK3zCiQuBRyGW/wGaQQuqZYkObM8O7T3EX8M1Ln1inqAI/SfGhiqzby22iP1XKtewVYgI+0IwmFCGAr0UToqqKidTWRX/gmdv3Ro1aEExdZacDoPHiVp1SREQgy/go3Vn6F4CAqpGyxzVjbAtlBXWQE3tBrLLL7Rhh5t8ZUrpr86mB1p04Q4ukM2hbhTVVi8f4SNBx+/ubrbDC99CJgMCwrrDnKe5tUiLRZ5vcnqtmjaIn07QfFUAVJ7ofdSI/n9Ay8hFZKhAQAA",
+  "Body": "H4sIAAAAAAAAAGWQW0sDMRCF/0uetyWke2OfLO4KCyJFqoLiw5jM0khuJFl0K/53sxTb0r4NZ75zTjI/BMa4s17uUXQapCINGaQP0YDGpYLDcIPfoJ3CJbeaZGeWp4D+bsYfEnVuvaLu4Qj9pyaGWzdtvI3Io7SmM/ChUJBmABUwIwIVxlk6Kmi4n9zMruMjhnjpsKZFDUZsrJJ86iNq0phRqYw4eQU7bz9TcZ8UUlZYMgRW0ZINPK8RVrkoeJ3e6FOP9fgijbBfLUyBNDQjge9QjCnuVJUWb+9pEyHO31zfbvvnLgWMTiRFtAeZUVYs6GrB6i0tGlo1efV6guZTJcjsld1ri+T3D4bTvJahAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62ea27062fc48ea34d5c8/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:34 GMT"
+      "Fri, 28 Mar 2025 05:07:52 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "38"
+      "44"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/POST__api_atlas_v2_groups_1.json
index 5d940ac0d5..00658decf6 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsU7DMBCG38VzXKdO45asTOywgBguvktr4diRzylCVd+dVBWFLihLphvu0/9/0kl3EtaPnCk9xjFk0ZSFsIkgE4pG6FLXsqykNs9r01Tbpt69ikK4y85saaPR1IAtmHpdwc7WHZY47b0LHyyat5M4JOom9pDzwI1S1scRJdJx1cewj9iubOwVDE5B9sDqqNU+xXFg9U96Ij9FMvlOnIsFKpSNIYMLlPjWdpd+l/wHXsjmep5ZLj/oMiYIGVpgeuF5Ovf8Mk4DzXO5cgs5pGiJmWZ53NhlXD4PLpN3nGe4/LLn90IE6GnCkdgm15KciME7CJbkEL2zX9fhiCVpkg9rM1XEtH+6PIOaOgSz01B1mlDTFtFYpI04fwPpLbQIYAQAAA==",
+  "Body": "H4sIAAAAAAAAALWUPWvDMBCG/4tmKzKKv/DaqXu7tHS4SK8TUUUyOjmlhPz3OoR+ZClePN1wD+/7wMGdhfETZ6SHOIUs+rIQJoEyrOiFLnUty63U3VNZ92XbV+2LKIS77poWjQbptmz0YKoOtK1sbbp57114Z9G/nsUhYZjZQ84j90oZHycrLU6bYwz7aHcbE4+KRqcoe2J10mqf4jSy+ic9wc+RDD+IS7FChTIxZHIBiX/a7tLvkv/AK9nczrPI5Rtdx8RSph0xnnmZzj2/jtOIZS43biWHFA2Yscjjh13H5ePgMrzjvMDll728FSLQETNuwSa5HeRMjN5RMJBj9M583oYDS2jIrp0bYto/Xn9BjcFS02naDhpWo7W2MRaVuHwBWv+JFF8EAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "301"
+      "299"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:57 GMT"
+      "Fri, 28 Mar 2025 05:07:46 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1599"
+      "1100"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_1.json
index 7f59bf063b..445d2471aa 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e62ea27062fc48ea34d5c8_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNTM5NzdiMjc3NmY3YTc0Y2QyIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzo0MloiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNjJlYTI3MDYyZmM0OGVhMzRkNWM4IiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yOFQwNTowNzo0N1oiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d53977b2776f7a74cd2/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62ea27062fc48ea34d5c8/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:42 GMT"
+      "Fri, 28 Mar 2025 05:07:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "132"
+      "147"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicySetup/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicySetup/POST__api_atlas_v2_groups_1.json
index 72f4246333..122c344041 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicySetup/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicySetup/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsU7DMBCG38VzXKdO40ZZmdhhATFcfJfWwrUt2ylCVd6dlIpCFpQl8//pv0863V2YtkPKFB/84DJry4LpSJAJWctkKWteVlyqp61qq6Yt1QsrmLlmak87iaoD7EDV2woaXffYV1NujXtPrH29sGOkfmKPOYfUCqGtH5AjnTcn7w4eu432JwHBCMgWkjhLcYh+CEn80x7JTpWJbM/GYoURQnuXwTiK6T5t1j5r/gOvZHNbzyKXH3QdE4QMHSR6Tst05vw6ToGWudy4lRyi15QSLfK4s+u4fBxNJmtSXuDyy45vBXNwou+7ykPgUxysAaeJB2+N/uQkie9UM9X6eHi8PoCaegTVSKh6SShpj6g00o6NX1AOHdlUBAAA",
+  "Body": "H4sIAAAAAAAAALWUsW7DIBCG34XZBEwCtrx26t4urTpc4OygYkCAU1VR3r1Oo6bNUnnx/H/675NOdyei3ZQLpocw+UI6XhGdEAoa0hHBhaR8S0X7xGXHm07uXkhF7CVTDSqB0MpW1aoWkqttX4s9zLmz/j2T7vVEDgn7mT2UEnPHmHZhMtTgcTMGPwSz3+gwMoiWQXGQ2VGwIYUpZvZPe0I3V2Z0PTlXK4xgOvgC1mPKt2l37XfNf+CVbK7rWeTyg65jYqDAHjI+52U69/w6ThGXuVy5lRxS0JgzLvK4seu4fBxsQWdzWeDyy57fKuJhxO+7KlOkcxydBa+RxuCs/qQokMqmnWtDGh4vD0Bib0C1Ara9QCOwMUZpgzty/gLtQV2tVAQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "294"
+      "295"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:03 GMT"
+      "Fri, 28 Mar 2025 05:07:52 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2955"
+      "1845"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e42d6badba6513a8c5fdf3_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e62ea858616125063f12ba_backupCompliancePolicy_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e42d6badba6513a8c5fdf3_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e62ea858616125063f12ba_backupCompliancePolicy_1.json
index a76bb34dfa..bb5a0b6dbc 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e42d6badba6513a8c5fdf3_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e62ea858616125063f12ba_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNmJhZGJhNjUxM2E4YzVmZGYzIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbeyJmcmVxdWVuY3lJbnRlcnZhbCI6MSwiZnJlcXVlbmN5VHlwZSI6ImRhaWx5IiwiaWQiOiI2N2U0MmQ2ZTk3N2IyNzc2ZjdhNzUzNDgiLCJyZXRlbnRpb25Vbml0IjoiZGF5cyIsInJldGVudGlvblZhbHVlIjoxfV0sInN0YXRlIjoiRU5BQkxJTkciLCJ1cGRhdGVkRGF0ZSI6IjIwMjUtMDMtMjZUMTY6Mzg6MDZaIiwidXBkYXRlZFVzZXIiOiJuemxvem1vZSJ9",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNjJlYTg1ODYxNjEyNTA2M2YxMmJhIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbeyJmcmVxdWVuY3lJbnRlcnZhbCI6MSwiZnJlcXVlbmN5VHlwZSI6ImRhaWx5IiwiaWQiOiI2N2U2MmVhYTU4NjE2MTI1MDYzZjEzMzYiLCJyZXRlbnRpb25Vbml0IjoiZGF5cyIsInJldGVudGlvblZhbHVlIjoxfV0sInN0YXRlIjoiRU5BQkxJTkciLCJ1cGRhdGVkRGF0ZSI6IjIwMjUtMDMtMjhUMDU6MDc6NTRaIiwidXBkYXRlZFVzZXIiOiJuemxvem1vZSJ9",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e42d6badba6513a8c5fdf3/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e62ea858616125063f12ba/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "540"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:06 GMT"
+      "Fri, 28 Mar 2025 05:07:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "103"
+      "133"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json b/test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
rename to test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
index 88e25d3e2e..e92515cf30 100644
--- a/test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
+++ b/test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d95adba6513a8c60321/clusters/cluster-207",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d2e/clusters/cluster-417",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:39:07 GMT"
+      "Fri, 28 Mar 2025 05:13:42 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "238"
+      "315"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
deleted file mode 100644
index 516d32eec4..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAO1WTW/bOBD9KwueE+vDseXqptpq4IU/AktpdlsUBi2NbTYUKZCUCzfwf9+hqHTtLLbooS166MGAzJl5HM6bN+QToeWBigLKsRRbtmsUNUwKEj+RotFGVssahNZ8zOo9KOeTcx2EJH7/4YpUTLCqqVJBNxxKNNwpaWQhOYlJPsuCdUiuiOH6PHwuS0DzJH2T3M9ycroiG1o8NnUHQuIt5RpwlaG/gMJIZdOBF2YFtLxTsAUFmD4CaiikKKk6WsiCY/ag8mNtTav0bjYdJ1maYzqFQ8VTZkYxsdOIbiMQ0MAEfxgQ+uHg2u9fh8M8GMb9KO4P3mFoyfRjxj7D7WsS9/2e71YeqMI6PJ/rzf1s9vf6IVnN0wmGYHLqWNvdErMCbbBAB1YCHokslosUPXZcbigfu4Qz4Ns5FXQHZbanqkTcLyfeKdnUU6wAGUZwE5Y3ZTDYjujIL17RUTga+D6isTP79lUUbcIoGm4jGt0UwwLtnG6Aa8ceZ+LRfj6RPRYS4/bG1Dr2vILLprwu4dCrpNjJctMrZOXRmnnUcKq9Q+i1yWjv/zLxOgL088d1MCCWNN4yxbdI0k/a1nPt5SmsvlTwp9zoL5lc7Hyx67n3T09VC1rrvTTfkui/vicrSGuZvJ7Tj1K9RfBWy2TUs63R2S6We0M0CFrZzr1gqqaNPlNbzcxLfSqoOSvacZHVULhG+kr7DUZ2q6Zq+xq9Awuxw2g3Flw8tj4/GlboDhIRhTZ2QFndIfa873dCnC7vMitDH2UIG/1W8qaCTvBZniwmycoKUKAsx7IRhsQ+ypw2RmYF5a2wcMjJqm6s5P87YGoFJcM5cYCXJ9cYDxP5SVwaTi4vOxzO0Ixq4IQm4Dh07NqPOFlwsvkyqZg5kjiyf9yYWThqk4eMuJG5FPz4o2rr6Oy2TO/XD2mWr4NWPr95/Q68Dn8FXu+zdZr85vV78jr4RXh91iveI5+lgOlXnhL2XWd9uuB3+PmHi1RSmjEo0+0+zVa3q+Uy/yvACMzePIeMV2mSTxe39oFIu+n/CFgNpOKAiwfKG+sHIbS4eDPhK6u9buwj073gXjJ9cHfbCsmjGrIj3mcVYszyjJz+AWanmWvrCgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "846"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:35 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_2.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_2.json
deleted file mode 100644
index 5ef23b6b74..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAO1WbY/aOBD+Kyd/6JdbyAsLoZFWFYW04gTLimS7154qZJIB3HXsyHZS0RX//cZJaGGvt7qT2qofKoEEnplnXp6ZsR8IzSoqUsjGUmzYtlTUMClI+EDSUhuZLwoQWvMxK3agGp2Ea88n4V/vL0jOBMvLPBJ0zSFDwY2SRqaSk5Aks9hb+eSCGK5PzecyAxRPolej21lCDhdkTdP7smhBSLihXAOeMtQXkBqpbDjwSKyAZjcKNqAAw0dADakUGVV7C5lyjB5Usi+saBndzKbjURwlGE7aoGKWsVFMbLVF14ZaW4QnuRRbma1Dx2lBOl6/o3co7LgufrqVLj+qbqvWyaDqCjChH7hecPFVE+//m/hPmTgvkJEro0p4Rkuzi2WpUriiGbLxTEHBWUpjMFfUcKo72wHzMvcIjfkfU41V9SXb37WqzjL+uv+6tFh5AxP8ornv+v2O2+v4g8QbhL0g7PXfoY+M6fuYfYLXL0nYc7tuc3JHFYZ4bIBXt7PZ29XdaDmPJmiCLKp9YWkZmSVog51UsQyQe3K9uI5QY8vlmvJxE2IMfDOngm4hi21qiPu5NbZKlsXUcjkI4NLPLjOvvxnSoZs+p0N/2HdtGdiJfPM8CNZ+EAw2AQ0u00GKck7XwHXT5pyJe/vzgeyw49BuZ0yh63rJMquL0xaqm8rcoQVz6uI7le/UwWjn3yI5llyf1J7Y7uZ1S/MNlvwHuXWaOXQUVl8q+EOu9edIzjyfeT3V/uGhakELvZPmvwT6RfdgN5eVTF7O6Qep3iB4vfTIsGtbo5WdHXcHKBA0t517xlRBS32ylgpmHi+ydiTrjVNA2jTSE+3XH1pXZV73NWp7FmKL1s3+bOyx9fnesFS3kIgo7GSnYOcOsec9tx3E6eImtmPo4hjCWr+RvMyh3YxxMrqejJZ2AAWO5ViWwpDQxTHHzSLjlPJ6sPA2kHlR2pH/5yYuFGQMF2oFjzPXaA8T+VGcCw5NXHY5nKDZfXZAEXDczvbse2TmHWy8TCpm9iQM7J9mzVw31I7uYtLcLQvB99+rtg2drcvodnUXxcnKq8fnF6/fgNfBz8DrbbyKRr94/Za89n8SXo/zivfIJylg+sRTwj6ArU5r/A5//tZYKinNGJRpvU/j5evlYpH86TVvNHM0mU5m9vVjaLv57wErgTRUeFhRXlod8KHGxFsJX1j1VWNf4s0z9zHLVXOvLZE4qiHe412WI8YsicnhbzIsRzkQDAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "942"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:43:17 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "81"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_3.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_3.json
deleted file mode 100644
index a83301c8c7..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAO1WbY/aOBD+Kyd/6JdbyAsLoZFWFYW04gTLimS7154qZJIB3HXsyHZS0RX//cZJaGGvt7qT2qofKoEEnplnXp6ZsR8IzSoqUsjGUmzYtlTUMClI+EDSUhuZLwoQWvMxK3agGp2Ea88n4V/vL0jOBMvLPBJ0zSFDwY2SRqaSk5Aks9hb+eSCGK5PzecyAxRPolej21lCDhdkTdP7smhBSLihXAOeMtQXkBqpbDjwSKyAZjcKNqAAw0dADakUGVV7C5lyjB5Usi+saBndzKbjURwlGE7aoGKWsVFMbLVF14ZaW4QnuRRbma1Dx2lBOl6/o3co7LgufrqVLj+qbqvWyaDqCjChH7hecPFVE+//m/hPmTgvkJEro0p4Rkuzi2WpUriiGbLxTEHBWUpjMFfUcKo72wHzMvcIjfkfU41V9SXb37WqzjL+uv+6tFh5AxP8ornv+v2O2+v4g8QbhL0g7PXfoY+M6fuYfYLXL0nYc7tuc3JHFYZ4bIBXt7PZ29XdaDmPJmiCLKp9YWkZmSVog51UsQyQe3K9uI5QY8vlmvJxE2IMfDOngm4hi21qiPu5NbZKlsXUcjkI4NLPLjOvvxnSoZs+p0N/2HdtGdiJfPM8CNZ+EAw2AQ0u00GKck7XwHXT5pyJe/vzgeyw49BuZ0yh63rJMquL0xaqm8rcoQVz6uI7le/UwWjn3yI5llyf1J7Y7uZ1S/MNlvwHuXWaOXQUVl8q+EOu9edIzjyfeT3V/uGhakELvZPmvwT6RfdgN5eVTF7O6Qep3iB4vfTIsGtbo5WdHXcHKBA0t517xlRBS32ylgpmHi+ydiTrjVNA2jTSE+3XH1pXZV73NWp7FmKL1s3+bOyx9fnesFS3kIgo7GSnYOcOsec9tx3E6eImtmPo4hjCWr+RvMyh3YxxMrqejJZ2AAWO5ViWwpDQxTHHzSLjlPJ6sPA2kHlR2pH/5yYuFGQMF2oFjzPXaA8T+VGcCw5NXHY5nKDZfXZAEXDczvbse2TmHWy8TCpm9iQM7J9mzVw31I7uYtLcLQvB99+rtg2drcvodnUXxcnKq8fnF6/fgNfBz8DrbbyKRr94/Za89n8SXo/zivfIJylg+sRTwj6ArU5r/A5//tZYKinNGJRpvU/j5evlYpH86TVvNHM0mU5m9vVjaLv57wErgTRUeFhRXlod8KHGxFsJX1j1VWNf4s0z9zHLVXOvLZE4qiHe412WI8YsicnhbzIsRzkQDAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "942"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:43:19 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "78"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
new file mode 100644
index 0000000000..4a1097d35d
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAO1WyW7bMBD9lYLnxFoSL9FNtdXAhZfAUpIuKAxaGttsKFIgKRdO4H/v0FRSO0WLHtoihxwMyJyZx0c+viEfCC02VORQ9KVYslWtqGFSkOiB5LU2spxWILTmfVatQbmcjOsgJNHnLyekZIKVdZkIuuBQYOBKSSNzyUlEslEazENyQgzXh+VjWQCGB8m7+HqUkd0JWdD8rq4aEBItKdeAowzzBeRGKksHnoUV0OJKwRIUIH0E1JBLUVC1tZA5R/agsm1lQ7PkajTsx2mSIZ3coeIqU6OYWGlEtxUIaGCAPywI/bB96p+dhr3Mb0d+NwouPmFpwfRdyu7h8i2JzvyW70ZuqcJ9eFzXu+vR6OP8Np6NkwGWIDm1rexssZmBNrhBG1YALolMppMEM1ZcLijvO8Ip8OWYCrqCIl1TVSDu04pXStbVEHeAdLrQCaF33u51gk4Qtv3O2dIvQkA0dhDvHsWBnmOc0wVw7dTjTNzZzweyxo3EurUxlY48L+eyLk4L2LRKKVayWLRyWXq0Yh41nGpvE3p7Mtr7FROvEUA/fpyeB11iVeN7qfgSVfpf83rugHkK918qeC8X+onK0dRH0x5m/3+uWtBKr6X5E6Y/cnfWkzYyeDumX6W6QfS9nUmv5ZOn2NFwq4MBQUt7eI/FqmitDxxXMfPcowoqzvJ9y0gryN1h+s0R7FlYUZf7s43ZgYVYYbVrDa4ejz/fGpbrBhIRhTa2SVnvIfb4zG/MOJxepdaKPloRFvpG8rqExvRpFk8G8cyaUKA1+7IWhkQ+Wp3WRqY55XtzYaOTZVVb2//cZCoFBcNesYHnK9dYDwP5TRwHdo6XbRAHaEbVsMMQcGw8duxfrCzYWb5MKma2JOraP67VTJy28W1KXNucCr79V3vr5GymTK7nt0mazYO9gV51/Qu6dl6CrtfpPIlfdf2burZfiK6PfsWL5F4KGP66l1/Y54TNaYo/4ecbV6mkNH1Qppl9mM4uZ9Np9iHACmRvHkv6syTOhpNL+0ikTfe/A9wNlGKDgxvKa5sH+LSxuHg14Utrf93Yh6Z7xT1XeuMutxmKRzWkW7zQSsQYZSnZfQdUbjQ37woAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d2e/clusters/cluster-417",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "835"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "54"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_2.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_2.json
new file mode 100644
index 0000000000..4366274afe
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAO1WbY8aNxD+K5U/5EsO9oXj5VY6VQRIRAXHid3LpakqZHYHcM9rr2zvpuTEf+94vSRwTaKqSqJ8iAQSeGYej+eZeexHQrOKihSykRQbti0VNUwKEj2StNRG5osChNZ8xIodKOeTcB2EJPrjzwuSM8HyMp8IuuaQoeFWSSNTyUlEklkcrEJyQQzXp+FzmQGax5OXw7tZQg4XZE3Th7JoQEi0oVwDrjL0F5AaqWw68MSsgGa3CjagANNHQA2pFBlVewuZcsweVLIvrGk5uZ1NR8N4kmA6qUPFU8ZGMbHVFl0bamMRnuRSbGW2jjyvAWldBv2W3qG15fv4aW/F3+Wm3fi1MqjaAkwU9v2gf/HpmOB/xIRfivF+RVKujSrhGS3NLpalSuGaZkjIMwUFZymNwVxTw6lu7Yr+FescobEEx9PGqvp44OdaVeeH/nQCdXmx+gbG+MX40A+7Lb/TCgeJ3438fhRcvcVNMqYfYvYeXr0gUcdv+27lnirM8dgEL+9ms99X98PlfDLGEGRS7QtLzdAsQRvspoplgPyTm8XNBD22XK4pH7kcY+CbORV0C1lsz4a4H9pjq2RZTC2fvT70Qhhcdge9oBeEXb/X2fhZCIjGTuz9MzvQS7RzugauXatzJh7sz0eyw67DuJ0xha4LJsusLk5TqHYqc48WzKur71WhVyejvc9lcqy5Pi0+sS3O677mG6z599rXc9PoKay/VPCbXOsPqZxtfbbtqff3z1ULWuidNP8l04++Bytg1jJ+Mad/SfUa0WvtI4O2nZLGdrbc7qFB0Nw27zlZBS31iTwVzDwVtGYua+UpIHXN9IUWHFhYUeZ1b6N3YCG2GO101MVj+/O9YaluIBFR2PFOwc4eYs87fjOM08VtbEfRx1GEtX4teZlDo5BxMrwZD5d2CAWO5kiWwpDIx1FHeZFxSnk9XHgryLwo7dj/W5ELBRlDYa3g6ck1xsNYvhPnhoPLywrECZoVtQOagKNK27VvcbLgYPNlUjGzJ1Hf/nFSc+O4Hd7HxN0xC8H336q2js5my8nd6n4SJ6ugHqCfvH4FXns/Aq938Woy/Mnr1+S1+4PwepxXvEjeSwHTz2v5lX1OWJ8m+C3+/MVFKinNCJRpdp/Gy1fLxSJ5E7iHmjmGTMcz+wIytFH+B8BKIA0VLlaUl9YH8FljMfFawldWfdXYF7l77j5luXIX2xKJoxriPV5mOWLMkpgc/gHtt0dHGAwAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d2e/clusters/cluster-417",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "937"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:13:39 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "67"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_3.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_3.json
new file mode 100644
index 0000000000..940dab9f9d
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAO1WbY8aNxD+K5U/5EsO9oXj5VY6VQRIRAXHid3LpakqZHYHcM9rr2zvpuTEf+94vSRwTaKqSqJ8iAQSeGYej+eZeexHQrOKihSykRQbti0VNUwKEj2StNRG5osChNZ8xIodKOeTcB2EJPrjzwuSM8HyMp8IuuaQoeFWSSNTyUlEklkcrEJyQQzXp+FzmQGax5OXw7tZQg4XZE3Th7JoQEi0oVwDrjL0F5AaqWw68MSsgGa3CjagANNHQA2pFBlVewuZcsweVLIvrGk5uZ1NR8N4kmA6qUPFU8ZGMbHVFl0bamMRnuRSbGW2jjyvAWldBv2W3qG15fv4aW/F3+Wm3fi1MqjaAkwU9v2gf/HpmOB/xIRfivF+RVKujSrhGS3NLpalSuGaZkjIMwUFZymNwVxTw6lu7Yr+FescobEEx9PGqvp44OdaVeeH/nQCdXmx+gbG+MX40A+7Lb/TCgeJ3438fhRcvcVNMqYfYvYeXr0gUcdv+27lnirM8dgEL+9ms99X98PlfDLGEGRS7QtLzdAsQRvspoplgPyTm8XNBD22XK4pH7kcY+CbORV0C1lsz4a4H9pjq2RZTC2fvT70Qhhcdge9oBeEXb/X2fhZCIjGTuz9MzvQS7RzugauXatzJh7sz0eyw67DuJ0xha4LJsusLk5TqHYqc48WzKur71WhVyejvc9lcqy5Pi0+sS3O677mG6z599rXc9PoKay/VPCbXOsPqZxtfbbtqff3z1ULWuidNP8l04++Bytg1jJ+Mad/SfUa0WvtI4O2nZLGdrbc7qFB0Nw27zlZBS31iTwVzDwVtGYua+UpIHXN9IUWHFhYUeZ1b6N3YCG2GO101MVj+/O9YaluIBFR2PFOwc4eYs87fjOM08VtbEfRx1GEtX4teZlDo5BxMrwZD5d2CAWO5kiWwpDIx1FHeZFxSnk9XHgryLwo7dj/W5ELBRlDYa3g6ck1xsNYvhPnhoPLywrECZoVtQOagKNK27VvcbLgYPNlUjGzJ1Hf/nFSc+O4Hd7HxN0xC8H336q2js5my8nd6n4SJ6ugHqCfvH4FXns/Aq938Woy/Mnr1+S1+4PwepxXvEjeSwHTz2v5lX1OWJ8m+C3+/MVFKinNCJRpdp/Gy1fLxSJ5E7iHmjmGTMcz+wIytFH+B8BKIA0VLlaUl9YH8FljMfFawldWfdXYF7l77j5luXIX2xKJoxriPV5mOWLMkpgc/gHtt0dHGAwAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d2e/clusters/cluster-417",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "937"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:13:41 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "68"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestClustersFile/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index db035d92a9..222db5d581 100644
--- a/test/e2e/.snapshots/TestClustersFile/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestClustersFile/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:34 GMT"
+      "Fri, 28 Mar 2025 05:07:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json b/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
deleted file mode 100644
index dd0817ae6a..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "eyJhZHZhbmNlZENvbmZpZ3VyYXRpb24iOnsiY3VzdG9tT3BlbnNzbENpcGhlckNvbmZpZ1RsczEyIjpbXSwibWluaW11bUVuYWJsZWRUbHNQcm90b2NvbCI6IlRMUzFfMiIsInRsc0NpcGhlckNvbmZpZ01vZGUiOiJERUZBVUxUIn0sImJhY2t1cEVuYWJsZWQiOmZhbHNlLCJiaUNvbm5lY3RvciI6eyJlbmFibGVkIjpmYWxzZSwicmVhZFByZWZlcmVuY2UiOiJzZWNvbmRhcnkifSwiY2x1c3RlclR5cGUiOiJSRVBMSUNBU0VUIiwiY29ubmVjdGlvblN0cmluZ3MiOnsic3RhbmRhcmQiOiJtb25nb2RiOi8vY2x1c3Rlci0xNS1zaGFyZC0wMC0wMC52c3V3ci5tb25nb2RiLWRldi5uZXQ6MjcwMTcsY2x1c3Rlci0xNS1zaGFyZC0wMC0wMS52c3V3ci5tb25nb2RiLWRldi5uZXQ6MjcwMTcsY2x1c3Rlci0xNS1zaGFyZC0wMC0wMi52c3V3ci5tb25nb2RiLWRldi5uZXQ6MjcwMTcvP3NzbD10cnVlJmF1dGhTb3VyY2U9YWRtaW4mcmVwbGljYVNldD1hdGxhcy1nNmkxZDAtc2hhcmQtMCIsInN0YW5kYXJkU3J2IjoibW9uZ29kYitzcnY6Ly9jbHVzdGVyLTE1LnZzdXdyLm1vbmdvZGItZGV2Lm5ldCJ9LCJjcmVhdGVEYXRlIjoiMjAyNS0wMy0yNlQxNjozNzozNVoiLCJkaXNrU2l6ZUdCIjo0MC4wLCJkaXNrV2FybWluZ01vZGUiOiJGVUxMWV9XQVJNRUQiLCJlbmNyeXB0aW9uQXRSZXN0UHJvdmlkZXIiOiJOT05FIiwiZ2xvYmFsQ2x1c3RlclNlbGZNYW5hZ2VkU2hhcmRpbmciOmZhbHNlLCJncm91cElkIjoiNjdlNDJkNGQxNWY4YTgwYzlhODI4NTAwIiwiaWQiOiI2N2U0MmQ0Zjk3N2IyNzc2ZjdhNzRjNmMiLCJsYWJlbHMiOltdLCJsaW5rcyI6W3siaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlNDJkNGQxNWY4YTgwYzlhODI4NTAwL2NsdXN0ZXJzL2NsdXN0ZXItMTUiLCJyZWwiOiJzZWxmIn0seyJocmVmIjoiaHR0cHM6Ly9jbG91ZC1kZXYubW9uZ29kYi5jb20vYXBpL2F0bGFzL3YyL2dyb3Vwcy82N2U0MmQ0ZDE1ZjhhODBjOWE4Mjg1MDAvY2x1c3RlcnMvY2x1c3Rlci0xNS9iYWNrdXAvcmVzdG9yZUpvYnMiLCJyZWwiOiJodHRwczovL2Nsb3VkLm1vbmdvZGIuY29tL3Jlc3RvcmVKb2JzIn0seyJocmVmIjoiaHR0cHM6Ly9jbG91ZC1kZXYubW9uZ29kYi5jb20vYXBpL2F0bGFzL3YyL2dyb3Vwcy82N2U0MmQ0ZDE1ZjhhODBjOWE4Mjg1MDAvY2x1c3RlcnMvY2x1c3Rlci0xNS9iYWNrdXAvc25hcHNob3RzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9zbmFwc2hvdHMifV0sIm1vbmdvREJNYWpvclZlcnNpb24iOiI4LjAiLCJtb25nb0RCVmVyc2lvbiI6IjguMC42IiwibmFtZSI6ImNsdXN0ZXItMTUiLCJwYXVzZWQiOmZhbHNlLCJwaXRFbmFibGVkIjpmYWxzZSwicmVwbGljYXRpb25TcGVjcyI6W3siaWQiOiI2N2U0MmQ0Zjk3N2IyNzc2ZjdhNzRjNTgiLCJudW1TaGFyZHMiOjEsInJlZ2lvbkNvbmZpZ3MiOlt7ImFuYWx5dGljc1NwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjB9LCJhdXRvU2NhbGluZyI6eyJjb21wdXRlIjp7ImVuYWJsZWQiOmZhbHNlLCJwcmVkaWN0aXZlRW5hYmxlZCI6ZmFsc2UsInNjYWxlRG93bkVuYWJsZWQiOmZhbHNlfSwiZGlza0dCIjp7ImVuYWJsZWQiOnRydWV9fSwiZWxlY3RhYmxlU3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MX0sInByaW9yaXR5Ijo3LCJwcm92aWRlck5hbWUiOiJBV1MiLCJyZWFkT25seVNwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjB9LCJyZWdpb25OYW1lIjoiRVVfV0VTVF8xIn0seyJhbmFseXRpY3NTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjowfSwiYXV0b1NjYWxpbmciOnsiY29tcHV0ZSI6eyJlbmFibGVkIjpmYWxzZSwicHJlZGljdGl2ZUVuYWJsZWQiOmZhbHNlLCJzY2FsZURvd25FbmFibGVkIjpmYWxzZX0sImRpc2tHQiI6eyJlbmFibGVkIjp0cnVlfX0sImVsZWN0YWJsZVNwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjF9LCJwcmlvcml0eSI6NiwicHJvdmlkZXJOYW1lIjoiQVdTIiwicmVhZE9ubHlTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjowfSwicmVnaW9uTmFtZSI6IlVTX0VBU1RfMSJ9LHsiYW5hbHl0aWNzU3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MH0sImF1dG9TY2FsaW5nIjp7ImNvbXB1dGUiOnsiZW5hYmxlZCI6ZmFsc2UsInByZWRpY3RpdmVFbmFibGVkIjpmYWxzZSwic2NhbGVEb3duRW5hYmxlZCI6ZmFsc2V9LCJkaXNrR0IiOnsiZW5hYmxlZCI6dHJ1ZX19LCJlbGVjdGFibGVTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjoxfSwicHJpb3JpdHkiOjUsInByb3ZpZGVyTmFtZSI6IkFXUyIsInJlYWRPbmx5U3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MH0sInJlZ2lvbk5hbWUiOiJVU19XRVNUXzEifV0sInpvbmVJZCI6IjY3ZTQyZDRmOTc3YjI3NzZmN2E3NGM2MiIsInpvbmVOYW1lIjoiWm9uZSAxIn1dLCJyb290Q2VydFR5cGUiOiJJU1JHUk9PVFgxIiwic3RhdGVOYW1lIjoiVVBEQVRJTkciLCJ0YWdzIjpbXSwidGVybWluYXRpb25Qcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsInZlcnNpb25SZWxlYXNlU3lzdGVtIjoiTFRTIn0=",
-  "Status": 200,
-  "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
-  "Headers": {
-    "Content-Length": [
-      "3065"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:43:19 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "780"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::updateCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json b/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
new file mode 100644
index 0000000000..8104288e92
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "eyJhZHZhbmNlZENvbmZpZ3VyYXRpb24iOnsiY3VzdG9tT3BlbnNzbENpcGhlckNvbmZpZ1RsczEyIjpbXSwibWluaW11bUVuYWJsZWRUbHNQcm90b2NvbCI6IlRMUzFfMiIsInRsc0NpcGhlckNvbmZpZ01vZGUiOiJERUZBVUxUIn0sImJhY2t1cEVuYWJsZWQiOmZhbHNlLCJiaUNvbm5lY3RvciI6eyJlbmFibGVkIjpmYWxzZSwicmVhZFByZWZlcmVuY2UiOiJzZWNvbmRhcnkifSwiY2x1c3RlclR5cGUiOiJSRVBMSUNBU0VUIiwiY29ubmVjdGlvblN0cmluZ3MiOnsic3RhbmRhcmQiOiJtb25nb2RiOi8vY2x1c3Rlci00MTctc2hhcmQtMDAtMDAuZ254dWYubW9uZ29kYi1kZXYubmV0OjI3MDE3LGNsdXN0ZXItNDE3LXNoYXJkLTAwLTAxLmdueHVmLm1vbmdvZGItZGV2Lm5ldDoyNzAxNyxjbHVzdGVyLTQxNy1zaGFyZC0wMC0wMi5nbnh1Zi5tb25nb2RiLWRldi5uZXQ6MjcwMTcvP3NzbD10cnVlJmF1dGhTb3VyY2U9YWRtaW4mcmVwbGljYVNldD1hdGxhcy1ocDc5aTMtc2hhcmQtMCIsInN0YW5kYXJkU3J2IjoibW9uZ29kYitzcnY6Ly9jbHVzdGVyLTQxNy5nbnh1Zi5tb25nb2RiLWRldi5uZXQifSwiY3JlYXRlRGF0ZSI6IjIwMjUtMDMtMjhUMDU6MDc6MTlaIiwiZGlza1NpemVHQiI6NDAuMCwiZGlza1dhcm1pbmdNb2RlIjoiRlVMTFlfV0FSTUVEIiwiZW5jcnlwdGlvbkF0UmVzdFByb3ZpZGVyIjoiTk9ORSIsImdsb2JhbENsdXN0ZXJTZWxmTWFuYWdlZFNoYXJkaW5nIjpmYWxzZSwiZ3JvdXBJZCI6IjY3ZTYyZTg0NTg2MTYxMjUwNjNmMGQyZSIsImlkIjoiNjdlNjJlODc1ODYxNjEyNTA2M2YwZWE0IiwibGFiZWxzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTYyZTg0NTg2MTYxMjUwNjNmMGQyZS9jbHVzdGVycy9jbHVzdGVyLTQxNyIsInJlbCI6InNlbGYifSx7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTYyZTg0NTg2MTYxMjUwNjNmMGQyZS9jbHVzdGVycy9jbHVzdGVyLTQxNy9iYWNrdXAvcmVzdG9yZUpvYnMiLCJyZWwiOiJodHRwczovL2Nsb3VkLm1vbmdvZGIuY29tL3Jlc3RvcmVKb2JzIn0seyJocmVmIjoiaHR0cHM6Ly9jbG91ZC1kZXYubW9uZ29kYi5jb20vYXBpL2F0bGFzL3YyL2dyb3Vwcy82N2U2MmU4NDU4NjE2MTI1MDYzZjBkMmUvY2x1c3RlcnMvY2x1c3Rlci00MTcvYmFja3VwL3NuYXBzaG90cyIsInJlbCI6Imh0dHBzOi8vY2xvdWQubW9uZ29kYi5jb20vc25hcHNob3RzIn1dLCJtb25nb0RCTWFqb3JWZXJzaW9uIjoiOC4wIiwibW9uZ29EQlZlcnNpb24iOiI4LjAuNiIsIm5hbWUiOiJjbHVzdGVyLTQxNyIsInBhdXNlZCI6ZmFsc2UsInBpdEVuYWJsZWQiOmZhbHNlLCJyZXBsaWNhdGlvblNwZWNzIjpbeyJpZCI6IjY3ZTYyZTg3NTg2MTYxMjUwNjNmMGU4NyIsIm51bVNoYXJkcyI6MSwicmVnaW9uQ29uZmlncyI6W3siYW5hbHl0aWNzU3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MH0sImF1dG9TY2FsaW5nIjp7ImNvbXB1dGUiOnsiZW5hYmxlZCI6ZmFsc2UsInByZWRpY3RpdmVFbmFibGVkIjpmYWxzZSwic2NhbGVEb3duRW5hYmxlZCI6ZmFsc2V9LCJkaXNrR0IiOnsiZW5hYmxlZCI6dHJ1ZX19LCJlbGVjdGFibGVTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjoxfSwicHJpb3JpdHkiOjcsInByb3ZpZGVyTmFtZSI6IkFXUyIsInJlYWRPbmx5U3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MH0sInJlZ2lvbk5hbWUiOiJFVV9XRVNUXzEifSx7ImFuYWx5dGljc1NwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjB9LCJhdXRvU2NhbGluZyI6eyJjb21wdXRlIjp7ImVuYWJsZWQiOmZhbHNlLCJwcmVkaWN0aXZlRW5hYmxlZCI6ZmFsc2UsInNjYWxlRG93bkVuYWJsZWQiOmZhbHNlfSwiZGlza0dCIjp7ImVuYWJsZWQiOnRydWV9fSwiZWxlY3RhYmxlU3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MX0sInByaW9yaXR5Ijo2LCJwcm92aWRlck5hbWUiOiJBV1MiLCJyZWFkT25seVNwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjB9LCJyZWdpb25OYW1lIjoiVVNfRUFTVF8xIn0seyJhbmFseXRpY3NTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjowfSwiYXV0b1NjYWxpbmciOnsiY29tcHV0ZSI6eyJlbmFibGVkIjpmYWxzZSwicHJlZGljdGl2ZUVuYWJsZWQiOmZhbHNlLCJzY2FsZURvd25FbmFibGVkIjpmYWxzZX0sImRpc2tHQiI6eyJlbmFibGVkIjp0cnVlfX0sImVsZWN0YWJsZVNwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjF9LCJwcmlvcml0eSI6NSwicHJvdmlkZXJOYW1lIjoiQVdTIiwicmVhZE9ubHlTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjowfSwicmVnaW9uTmFtZSI6IlVTX1dFU1RfMSJ9XSwiem9uZUlkIjoiNjdlNjJlODc1ODYxNjEyNTA2M2YwZTk0Iiwiem9uZU5hbWUiOiJab25lIDEifV0sInJvb3RDZXJ0VHlwZSI6IklTUkdST09UWDEiLCJzdGF0ZU5hbWUiOiJVUERBVElORyIsInRhZ3MiOltdLCJ0ZXJtaW5hdGlvblByb3RlY3Rpb25FbmFibGVkIjpmYWxzZSwidmVyc2lvblJlbGVhc2VTeXN0ZW0iOiJMVFMifQ==",
+  "Status": 200,
+  "Method": "PATCH",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d2e/clusters/cluster-417",
+  "Headers": {
+    "Content-Length": [
+      "3073"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:13:41 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "771"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::updateCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_1.json
index 2eaaff8ca5..3dcae372b1 100644
--- a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW/DIBBA/wuzHTD+LGulSt3bpVWHC5xtFGwswOkQ+b/XUZS0XiovzPf07klwFyLN7AO6ZzuPgQiWEOkQAioiCGe8TFme8uotq0Rei7z4IAnR11lVY8FVobKybaBh8gka3pSMrXOjx5Mn4vNCeoftyvYhTF5QKo2dVarwfBjs2Fl1PEg7UJg0hWDA0zOnnbPz5Ok/dodmVXo0LVmSCCuotGMAPaLzj20b+8b8B45Uc3ueXS13NE6JggBH8Pju9+Vs+ThNE+5ruXGRGpyV6D3u6niwcVq+ex3QaB92tPyyy1dCRhhwxe9/6EUbTJFjmlX16rKue71efYmtgqrhkLccFcdaqUoqLMjyA2BYs4hJBAAA",
+  "Body": "H4sIAAAAAAAAALWTsW7DIBCG34XZDhjbGHmtVKl7u7TqQODsoGKwAKdD5HcvUZS0XiovzPfp/z/p7i5ImiVE8E9usRH1pEDSg4igUI8ooW1J6pLyV9L2pOsr/o4KpK8z1gGjwJuWs4pVtCWsHoiikOZG26+A+o8LOnkYEnuKcQ49xtK4RZUKzofJ2dGp40G6CYtZYxGNCPhM8ejdMgf8T7oHkyIDmAGtRYYKLJ2NQlvw4dG2Sd8k/4Ez2dzWs8vljuYxUSKKowjwFvbpbPk8TjPsc7lxmRy8kxAC7PJ4sHlcvk86gtEh7nD5ZdfPAlkxQcLvN/SsDZRAoawanrKcH1+uX9/CoATjVNQDhVTYKcWkggatP0j8iYBJBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:33 GMT"
+      "Fri, 28 Mar 2025 05:07:16 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1694"
+      "2157"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=241ebaaa923f8976e089f60cd8094828546f28c7; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_1.json b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_1.json
deleted file mode 100644
index 0a6dd9a038..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAO1WTW/bOBD9KwueE+vDseXqptpq4IU/AktpdlsUBi2NbTYUKZCUCzfwf9+hqHTtLLbooS166MGAzJl5HM6bN+QToeWBigLKsRRbtmsUNUwKEj+RotFGVssahNZ8zOo9KOeTcx2EJH7/4YpUTLCqqVJBNxxKNNwpaWQhOYlJPsuCdUiuiOH6PHwuS0DzJH2T3M9ycroiG1o8NnUHQuIt5RpwlaG/gMJIZdOBF2YFtLxTsAUFmD4CaiikKKk6WsiCY/ag8mNtTav0bjYdJ1maYzqFQ8VTZkYxsdOIbiMQ0MAEfxgQ+uHg2u9fh8M8GMb9KO4P3mFoyfRjxj7D7WsS9/2e71YeqMI6PJ/rzf1s9vf6IVnN0wmGYHLqWNvdErMCbbBAB1YCHokslosUPXZcbigfu4Qz4Ns5FXQHZbanqkTcLyfeKdnUU6wAGUZwE5Y3ZTDYjujIL17RUTga+D6isTP79lUUbcIoGm4jGt0UwwLtnG6Aa8ceZ+LRfj6RPRYS4/bG1Dr2vILLprwu4dCrpNjJctMrZOXRmnnUcKq9Q+i1yWjv/zLxOgL088d1MCCWNN4yxbdI0k/a1nPt5SmsvlTwp9zoL5lc7Hyx67n3T09VC1rrvTTfkui/vicrSGuZvJ7Tj1K9RfBWy2TUs63R2S6We0M0CFrZzr1gqqaNPlNbzcxLfSqoOSvacZHVULhG+kr7DUZ2q6Zq+xq9Awuxw2g3Flw8tj4/GlboDhIRhTZ2QFndIfa873dCnC7vMitDH2UIG/1W8qaCTvBZniwmycoKUKAsx7IRhsQ+ypw2RmYF5a2wcMjJqm6s5P87YGoFJcM5cYCXJ9cYDxP5SVwaTi4vOxzO0Ixq4IQm4Dh07NqPOFlwsvkyqZg5kjiyf9yYWThqk4eMuJG5FPz4o2rr6Oy2TO/XD2mWr4NWPr95/Q68Dn8FXu+zdZr85vV78jr4RXh91iveI5+lgOlXnhL2XWd9uuB3+PmHi1RSmjEo0+0+zVa3q+Uy/yvACMzePIeMV2mSTxe39oFIu+n/CFgNpOKAiwfKG+sHIbS4eDPhK6u9buwj073gXjJ9cHfbCsmjGrIj3mcVYszyjJz+AWanmWvrCgAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "846"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:35 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "715"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_1.json b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_1.json
new file mode 100644
index 0000000000..b50166ad7b
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAO1WyW7bMBD9lYLnxFoSL9FNtdXAhZfAUpIuKAxaGttsKFIgKRdO4H/v0FRSO0WLHtoihxwMyJyZx0c+viEfCC02VORQ9KVYslWtqGFSkOiB5LU2spxWILTmfVatQbmcjOsgJNHnLyekZIKVdZkIuuBQYOBKSSNzyUlEslEazENyQgzXh+VjWQCGB8m7+HqUkd0JWdD8rq4aEBItKdeAowzzBeRGKksHnoUV0OJKwRIUIH0E1JBLUVC1tZA5R/agsm1lQ7PkajTsx2mSIZ3coeIqU6OYWGlEtxUIaGCAPywI/bB96p+dhr3Mb0d+NwouPmFpwfRdyu7h8i2JzvyW70ZuqcJ9eFzXu+vR6OP8Np6NkwGWIDm1rexssZmBNrhBG1YALolMppMEM1ZcLijvO8Ip8OWYCrqCIl1TVSDu04pXStbVEHeAdLrQCaF33u51gk4Qtv3O2dIvQkA0dhDvHsWBnmOc0wVw7dTjTNzZzweyxo3EurUxlY48L+eyLk4L2LRKKVayWLRyWXq0Yh41nGpvE3p7Mtr7FROvEUA/fpyeB11iVeN7qfgSVfpf83rugHkK918qeC8X+onK0dRH0x5m/3+uWtBKr6X5E6Y/cnfWkzYyeDumX6W6QfS9nUmv5ZOn2NFwq4MBQUt7eI/FqmitDxxXMfPcowoqzvJ9y0gryN1h+s0R7FlYUZf7s43ZgYVYYbVrDa4ejz/fGpbrBhIRhTa2SVnvIfb4zG/MOJxepdaKPloRFvpG8rqExvRpFk8G8cyaUKA1+7IWhkQ+Wp3WRqY55XtzYaOTZVVb2//cZCoFBcNesYHnK9dYDwP5TRwHdo6XbRAHaEbVsMMQcGw8duxfrCzYWb5MKma2JOraP67VTJy28W1KXNucCr79V3vr5GymTK7nt0mazYO9gV51/Qu6dl6CrtfpPIlfdf2burZfiK6PfsWL5F4KGP66l1/Y54TNaYo/4ecbV6mkNH1Qppl9mM4uZ9Np9iHACmRvHkv6syTOhpNL+0ikTfe/A9wNlGKDgxvKa5sH+LSxuHg14Utrf93Yh6Z7xT1XeuMutxmKRzWkW7zQSsQYZSnZfQdUbjQ37woAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d2e/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "835"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "787"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_index_1.json b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_index_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_index_1.json
rename to test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_index_1.json
index a8e4106c30..3ded9327f1 100644
--- a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_index_1.json
+++ b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e62e8458616125063f0d2e_clusters_cluster-417_index_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15/index",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d2e/clusters/cluster-417/index",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:43:18 GMT"
+      "Fri, 28 Mar 2025 05:13:39 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1062"
+      "1036"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/memory.json b/test/e2e/.snapshots/TestClustersFile/memory.json
index 76b259951a..2a07e85f70 100644
--- a/test/e2e/.snapshots/TestClustersFile/memory.json
+++ b/test/e2e/.snapshots/TestClustersFile/memory.json
@@ -1 +1 @@
-{"clusterFileName":"cluster-15"}
\ No newline at end of file
+{"clusterFileName":"cluster-417"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json b/test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
rename to test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_1.json
index 9fd052272a..9ff0869e8d 100644
--- a/test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
+++ b/test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
+  "Path": "/api/atlas/v2/groups/67e62e7f7062fc48ea34ce73/clusters/cluster-2",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:43:20 GMT"
+      "Fri, 28 Mar 2025 05:07:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "228"
+      "241"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
deleted file mode 100644
index 15d2176c25..0000000000
--- a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1U207bQBD9lWqfSZw4F4LfTHBRqiQg25SWqkJje+xs2exau5tIAfHvnbUTSqiK+sRDpM3MnDPX4yeWQf6wqSMJmcCCBSUIgycs41MlJeZWaRY8MXzj1gjFtcYSNcocWcAM5koWoHfs+YTlYmMs6nRXO1ccXc9n0zCJUkaulpUrmVjNZWWI3SGI0OIF/Qjg9/xRpzfo+OO0Pw4Gk2A4uSNowc1Dwh/x8pwFve6oNdyCXhPNQhUO+flmPv9+fxvGi+iCEFSb3tUuWWhjNPZaqy0vkDpiy6tlRBGVUBmIaVtvgqJcgIQKi2QFuiDel4YrrTb1jAbAxqc49IuzERQZjEf9AUzycW/g94mNv/JPjvzDEZBfQIaCOv7xk95cPrjnE1vRHAm3srY2geflQm2KToHb7lrJShVZN1drD2rugRVgvK3vNcUY71+VePv5m8Oj4/dOmVuaaDYlSlrSR+X12vvyNM1fafyiMvNSylHqo7Svoz++ViOhNitl/6fSP7HPtNXGc3G+gF9KfyV2Oj1CT7o99uI7MnfH5JCwdsd7vKwaNuaV4Gpu30pUYy14Do2WaszbY3rnBIcTl2uzbm6bovuOoiI0Kb3kVYtHQep0efaUZClLJ9gtzqSxQGp3GqQkC9cT/8tGYnZTJO0c1LZs2wtvE9eW5kpzu2PBqftzFJFGy3CZskNZe+tNch+FSXrfbwb8qCTO3pGZK8rF7MF39PzUIrVSdora7r9KsyS+jK+u0m9OuNSEPUCmcRSms+UlmS1Ue7XSXugz08ya2rLtF+ztQrbtZmOaIRhMdrTNNRHO04Q9/wYK4G+BaAUAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d95adba6513a8c60321/clusters/cluster-207",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "631"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "67"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_2.json b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_2.json
deleted file mode 100644
index a007285daa..0000000000
--- a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1U227TQBD9FbQPvNDEl1yxVKE0CVVQklaxS6EIVWt77Cx1ds3u2iit+u/M2k6bFFohHiol0npmzlzOXO5ISKObIp9yGmYQEy+hmYIjErKx4BwiLSTx7gg8UUug8bmEBCTwCIhHFESCx1Ruyf0RibJCaZDBNjeq1fR8PhuP/GlAUFV7ZYL7WjKeKuNdaWqw6J5sBE9FHHqWRaNWxpJI/JQttUZly7bx1/6VpmU6yNuNYSuGss1Be+7AdgZHfwU5/wNyXwZZH5TKjrUs4C0t9NoXhYzgmMYbxt9KyDMWUR/0MdUZVa31xpb94c45srAr2JflY83vlCyx7oa8lmsPnkuh4hhboGGCf/Tg2m6vZXdabj9w+l5n6HWHVxgmZurGZ7dwekI8u92rBZdUYpLpQsQG+fFiPv96fTlaLaYTRGA35TY37RnpFSh9LkXJYsAZIMuz5RQt0kyENBvXSfqQJQvKaQqxb4pDvw8jkkpR5DPT0/4Aum78vkfjkPZ7TocOo77dcR30xvb0wwN9t0dRn9EQMpyRb9/xzfiNed6RNU4e4tZa56piTBRxxU3DUzsSG4vmzKrot0rXqpJR1nOZ7EhX++wTM+ZZNdtZgpS/Vlyr3khLIv9CwicRqodUDkIfhN23fv1cFae5Wgv9L5k+2t5jVyvN5GRBfwj5Gb3j6CF62DZr0ugOxO0+KjjdmOE9bFZOC7V3onKmnx61ZjGr65NDVA/TCyPYHZpYxaaabbR2jIsU0XgbE5bWeMjwnpk4jUuUJIk5cSXMuFn0CMwOYpCFqYn9IcNlNizi7uy2bVmXN7r0TVmSCcn0lngD83FgEUyXo2VAdmk10gv/ejryg2unIvhWcJi9sGYmKWPTgK/w+aZGSiH0GKRu7vjMX52uzs6CL059wfQOMpvMzWXQNG02FXuCJ6biGUvS9b1/2oyy7uoK+aMK/C12coPO5oFP7n8DuBHp15YGAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d95adba6513a8c60321/clusters/cluster-207",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "740"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:39:06 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "66"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_1.json b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_1.json
new file mode 100644
index 0000000000..24e03d3f09
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1UXW/aMBT9K5OfCwmhJShvKWQVE9AqSdet01Q5yU3wauzINkgU8d97nUALTKv21Ackc+89536ebElG8+dVHQmacShIUFKu4YJkbCSFgNxIRYItgTO3AlrcKShBgciBBERDLkVB1YbsLkjOV9qASje1dcXR3XQyCpMoJehqWZkUiVFMVBrZLQIJDYzxhwDP9a46br/jDVP3KnD9oDd4RGjB9HPCXuDmmgRu96o1PFC1RJqZLCzy6/10+vPpIYxn0RgRWJva1DZZaGLQ5k7JNSsAOyLz23mEERWXGeWjtt4EeDmjglZQJAuqCuR9a7hSclVPcABk4MPAA7/03YFX5pdDoP3LHPw+srF3//DyxF/6Gfo5zYBjx79+45uJZ/vckgXOEXELY2odOE7O5aroFLDuLqWoZJF1c7l0aM0cajjVztpzmmK0869KnP389eHR8YhdGW/2xEtc0edkddrbchTOXir4JjP9VshJ4pOkx9GfXakWtNYLaf6nzvfYHe6z8YyvZ/SPVN+RG48O0cOuS958J+buAB2CLu3ZHq+ppit9JLSamXNpKqg5y2mjoRry9og+OL1BaTOtls1NY3TPUlSIRoWXrGrxwFGVNs+eEi1laYW6honQhqLKrfYwycx2xP6yoYjtDFEzB5XN2+bCh8S2pZhUzGxI4Ns/JxFpNA/nKTmUtbfeJ09RmKRPvWa8L1LA5AN52WnamD34EZ9fWqSS0oxAmf3XaJLEN/HtbfqjhwhswhwgozgK08n8Bs2GVnuV4lbw89LMGtsy7ZfrfCHrdq8xzpBqSDa4yyUSTtOE7F4BHw29XWAFAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e7f7062fc48ea34ce73/clusters/cluster-2",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "629"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:17 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "50"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_2.json b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_2.json
new file mode 100644
index 0000000000..fd8530fad2
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_cluster-2_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U207bQBD9lWofeCmJLwlxsISqkKQoVRJQbEpLVaG1PXa2OLtmdx0pIP69s7ZDCC2o6gNSIq1n5szlzOWBRDS+LYsxp1EOCfFTmis4JBEbCs4h1kIS/4HAC7UEmlxISEECj4H4REEseELlhjwekjgvlQYZbgqjWowvppPhIBiHBFW1VyZ4oCXjmTLelaYGi+7JSvBMJJFvWTRu9e7S4zTrt9QSlS3bxl+7u1RiA067MWwlsG5z0L7r2Y53+FeQ8z8g922Q9Ump/ETLEg5oqZeBKGUMJzRZMX4gochZTAPQJ1TnVCGyc2x3ts6RhW3BgVzvav6o5BrrbshrvZpAxTA2QMMI/4h3bfeohf7dfmgf+bbnO71rDJIwdRuwezg7Jb7dPqoFV1RiitlMJAb5+XI6/X5zNVjMxiNEYC/lpjDNGegFKH0hxZolgBNA5ufzMVpkuYhoPqxTDCBPZ5TTDJLAlIZ+nwYkk6IsJqajPQ96LnipZ/fcNO72gXa6MXgd9MZ2+n53T596EepzGkGOE/LjJ74ZvzXPB7LEuUPcUutCVXyJMqm4aXhqx2Jl0YJZFfnW2rWqZJT1WiZbytWOe2JGPK/mOk+R8PeJatW7aEnkXkj4IiL1lMhe4L2gz63fO1PFaaGWQv9LnjvbR+xnpRmdzugvIb+ibxw6RPfbZj0a3Z643UMFpyszts/bVNBSPTtMBdMvT1mzjtXNKSCuh+iN0eulJlK5qmYarR3jIkM0XsSUZTUecrxiJk7jEiVpag7bGibcrHcMZvcwyMxUxP6Q4RIbDnFntls2r4sbXAWmLMmEZHpDfM987FmE4/lgHpJtWo30MrgZD4LwxqnovRccJm+sl2HT2DTga3x+qJFSCD0EqZvrPQkWZ4vz8/CbU98tvYVMRlNzETTNmg3FjuBpqXjGknR95V82Y133dIH8UQXBBvu4QmfTMCCPvwGns7GPjAYAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e7f7062fc48ea34ce73/clusters/cluster-2",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "736"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:33 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "65"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_1.json
index f1362ab2b8..c662163f99 100644
--- a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGCwoV47dejWLq06HPYRUAxGtkmHiH8vUZS0LBWL53t69yT7LkSZ2Qd0z3YeA5FZQpRDCKiJJCxjPM2KlIm3XMiilmX1QRLSX2eiwpLpJw66AcHzAmolsoLl69z048kT+XkhncN2ZbsQJi8pVcbOOtV4Pgx2PFrdHJQdKEw9hWDA0zOjR2fnydN/7A7NqvRoWrIkEVZQZccA/YjOP7Zt7BvzHzhSze15drXc0TglGgI04PHd78vZ8nGaJtzXcuMiNTir0Hvc1fFg47R8d31A0/uwo+WXXb4SMsKAK37/Q69ZigzTnPPVZN3x5XrzHFsNomZQtAw1w0proTSWZPkBimFH3kcEAAA=",
+  "Body": "H4sIAAAAAAAAALWTPW/DIBBA/wuzHSj+FGunDt3apVUHAoeNgsECnA6R/3uJoqT1Unlhvqd3T4K7IGGWEME/u8VGxEiBhAceQSKGKKFNSaqS9m+kYaRjT80HKpC+ztoOWgqd6khLlah74FUtoKvS3Gh7Coh9XtDoQSV2jHEODGNh3CJLCefD5Ozg5PEg3IT5rDGPhgd8pnjwbpkD/sfuwSRlAKPQWmRYgYWzkWsLPjy2bewb8x84U83teXa13NE8JZJHfuQB3sO+nC2fp2mGfS03LlODdwJCgF0dDzZPy/eoIxgd4o6WX3b9KpDlEyT8/odeSQkUSlrXyeT88HK9+QaU5G1PeaUoyBQgZSsk1Gj9ATfXyMpHBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "284"
+      "282"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:45 GMT"
+      "Fri, 28 Mar 2025 05:07:11 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2457"
+      "3845"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_1.json b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_1.json
deleted file mode 100644
index bfdb725727..0000000000
--- a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UXW/aMBT9K5OfC4HwUZq3lGYVE9AqScfWaaqc+CZ4NXZkGySK+O+7TqArTKv21Ackc+89536e7EhG8+d1FUmaCWAkKKgwcEEyPlZSQm6VJsGOwJlbA2X3GgrQIHMgATGQK8mo3pL9BcnF2ljQ6bZyrji6n07GYRKlBF0NK1cysZrL0iC7QyChhRv8IcDv+INWp9fyh2l3GPRGQX/0iFDGzXPCX+D2mgSd9qAxLKheIc1MMYf8/DCdfn9ahPEsukEE1qa3lUsW2hiMvddqwxlgR2R+N48wohQqo2Lc1JuAKGZU0hJYsqSaIe9rw6VW62qCAyDDS+j77GpAWUaHg26PjvJhp+d3kY2/8Y9O/P0BRb+gGQjs+MdPfHP57J47ssQ5Im5pbWUCz8uFWrMWg017pWSpWNbO1cqjFfeoFdR4G9+rizHevyrxDvM3x0fL71wStzRRb0oUuKSPyus19+VpnL/S8EVl5rWUk9Qnad9Gf3ytRtLKLJX9n0r/xO5xq7Xn5npGfyn9Fdnx9BA9anfIq+/E3B6iQ9KVO97TZVV0bd4IruL2XKIaKsFzWmupgrw5pndOsD9yudar+rYxuusoSkSj0gteNngQqE6X50CJlqJwgt3ARBpLUe1Og5hk5nrif9lQzG6KqJ2j2uZNe+EicW1prjS3WxJcuj8nEWk0D+cpOZZ1sD4kT1GYpE/desAvSsLkHZm5olzMAfyIz08NUitlx6Dt4as0SeLb+O4u/eaEi03YI2QcR2E6md+iGbeBH5d6wtiMbb5b52vYNPuMcXLUQLLFHa6QZpomZP8boMtUql4FAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d95adba6513a8c60321/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "626"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:48 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "1154"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_1.json b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_1.json
new file mode 100644
index 0000000000..27640d4d61
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e62e7f7062fc48ea34ce73_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1UXW/aMBT9K5OfCwmhJShvKWQVE9AqSdet01Q5yU3wauzINkgU8d97nUALTKv21Ackc+89536ebElG8+dVHQmacShIUFKu4YJkbCSFgNxIRYItgTO3AlrcKShBgciBBERDLkVB1YbsLkjOV9qASje1dcXR3XQyCpMoJehqWZkUiVFMVBrZLQIJDYzxhwDP9a46br/jDVP3KnD9oDd4RGjB9HPCXuDmmgRu96o1PFC1RJqZLCzy6/10+vPpIYxn0RgRWJva1DZZaGLQ5k7JNSsAOyLz23mEERWXGeWjtt4EeDmjglZQJAuqCuR9a7hSclVPcABk4MPAA7/03YFX5pdDoP3LHPw+srF3//DyxF/6Gfo5zYBjx79+45uJZ/vckgXOEXELY2odOE7O5aroFLDuLqWoZJF1c7l0aM0cajjVztpzmmK0869KnP389eHR8YhdGW/2xEtc0edkddrbchTOXir4JjP9VshJ4pOkx9GfXakWtNYLaf6nzvfYHe6z8YyvZ/SPVN+RG48O0cOuS958J+buAB2CLu3ZHq+ppit9JLSamXNpKqg5y2mjoRry9og+OL1BaTOtls1NY3TPUlSIRoWXrGrxwFGVNs+eEi1laYW6honQhqLKrfYwycx2xP6yoYjtDFEzB5XN2+bCh8S2pZhUzGxI4Ns/JxFpNA/nKTmUtbfeJ09RmKRPvWa8L1LA5AN52WnamD34EZ9fWqSS0oxAmf3XaJLEN/HtbfqjhwhswhwgozgK08n8Bs24C/yoNBPGZkz7vTpfw7rdZoyToxqSDW5wiTTTNCG7Vzwg8XVWBQAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e7f7062fc48ea34ce73/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "624"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:16 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "983"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/memory.json b/test/e2e/.snapshots/TestClustersM0Flags/memory.json
index 119dd22a9c..3f85938b1d 100644
--- a/test/e2e/.snapshots/TestClustersM0Flags/memory.json
+++ b/test/e2e/.snapshots/TestClustersM0Flags/memory.json
@@ -1 +1 @@
-{"clusterName":"cluster-207"}
\ No newline at end of file
+{"clusterName":"cluster-2"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_1.json b/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
similarity index 85%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_1.json
rename to test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
index 9aae1bd8cb..7c7038572f 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-676",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:08:20 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "192"
+      "156"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_2.json b/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_2.json
similarity index 80%
rename from test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_2.json
rename to test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_2.json
index 59279142f8..9c6e44bfab 100644
--- a/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_2.json
+++ b/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJEYXRhIEZlZGVyYXRpb24gdGVuYW50IGZvciBwcm9qZWN0IDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSBhbmQgbmFtZSBlMmUtZGF0YS1mZWRlcmF0aW9uLTgyOSBub3QgZm91bmQuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiREFUQV9GRURFUkFUSU9OX1RFTkFOVF9OT1RfRk9VTkRfRk9SX05BTUUiLCJwYXJhbWV0ZXJzIjpbIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSIsImUyZS1kYXRhLWZlZGVyYXRpb24tODI5Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJEYXRhIEZlZGVyYXRpb24gdGVuYW50IGZvciBwcm9qZWN0IDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSBhbmQgbmFtZSBlMmUtZGF0YS1mZWRlcmF0aW9uLTY3NiBub3QgZm91bmQuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiREFUQV9GRURFUkFUSU9OX1RFTkFOVF9OT1RfRk9VTkRfRk9SX05BTUUiLCJwYXJhbWV0ZXJzIjpbIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSIsImUyZS1kYXRhLWZlZGVyYXRpb24tNjc2Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-676",
   "Headers": {
     "Content-Length": [
       "273"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:01 GMT"
+      "Fri, 28 Mar 2025 05:08:21 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "54"
+      "20"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
index 1e311dbc3f..856cf2af07 100644
--- a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAHWRMW/CMBCF/wryjKljJybJhhBSWaoKtV0QwyW+pJGCHWyHUqH899qgVh3aySffve/5nfdXUvdmVM/WnDuFdm1007WkvBL4cPHAi0erod8qUpJaFpmsU0abZSNoylKkecIFhYRzhZVMJG/InHRwXDk3HlHtTI+r3VOQgtVlQJahV5Yiy4UUnDOWsdKGmYej0a1RFQXfg6MwdJd7Wfcd9ej8nfrq0P6B40UhGc8zIXgWcCZOR+rtzXJZszSvlzlnMlUiEZjnAqqCTNOcKPAQotfo3A7bzmhS6rHv56S1Zhxu+gwbBRIQRMNRcVwqJWtkWfB4N85rOGJY1J4gRxpxtMGwR/ABRnNe0DbRl9MCFqcR7efiO6fC80KjJ4c5iYTg848+2Ay2O4PHjVaD6bR//OUa5M6HXtCv1i/btw2JF8ZCi/HzYhnnZrdQs1vcCtzP1TQdvgD3qPOlAQIAAA==",
+  "Body": "H4sIAAAAAAAAAHWRMW/CMBCF/wryjKljJ07IhhBSWaoKtV0QwyW+pJGCHWyHUqH899qgVh3aySffve/5nfdXUvdmVM/WnDuFdm1007WkvBL4cPHAi0erod8qUpJaLjNZp4w2eSNoylKkRcIFhYRzhZVMJG/InHRwXDk3HlHtTI+r3VOQgtVlQJahV5YiK4QUnDOWsdKGmYej0a1RFQXfg6MwdJd7Wfcd9ej8nfrq0P6B48ulZLzIhOBZwJk4Ham3N8u8ZmlR5wVnMlUiEVgUAqolmaY5UeAhRK/RuR22ndGk1GPfz0lrzTjc9Bk2CiQgiIaj4pgrJWtkWfB4N85rOGJY1J4gRxpxtMGwR/ABRmUuaZvoy2kBi9OI9nPxnVPheaHRk8OcRELw+UcfbAbbncHjRqvBdNo//nINcudDL+hX65ft24bEC2Ohxfh5sYxzs1uo2S1uBe7napoOXyMrd0kBAgAA",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "358"
+      "357"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:08:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "121"
+      "90"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
similarity index 63%
rename from test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
rename to test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
index b17dc56248..ed5c989f31 100644
--- a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rluQ6OnbhJtqqqRBeEKmBBDNf4EiKldmo7pajKf8dOBWKAySffve/5na+k7s2oHq05dwrtxuima0l1JfDh4oEXj1ZDv1OkIrUsc1lnjDarRtCMZUiLlAsKKecKDzKVvCFL0sFx7dx4RLU3Pa73D0EKVlcBWYVeVYm8EFJwzljOKhtm7o5Gt0YdKPgeHIWhu9zKuu+oR+dv1GeH9g8cL0vJeJELwfOAM3E6Uuc3y1XNsqJeFZzJTIlUYFEIOJRkmpZEgYcQvUbn9th2RpNKj32/JK014zDrc2wUSEAQDUfFcaWUrJHlwePdOK/hiGFRrwQ50oijDYY9gg8wWvCStqm+nBJITiPaz+Q7p8JzotGTtyWJhODzjz7YDLY7g8etVoPptL//5Rrkzode0K83T7uXLYkXxkKL8fNiGecWc6jFHPcA7udqmr4AxGYE9P8BAAA=",
+  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rluQ6OnThptqqqRBeEKmBBDNf4EiKldmo7pajKf8dOBWKAySffve/5na+k7s2oHq05dwrtxuima0l1JfDh4oEXj1ZDv1OkIrVc5bLOGG2KRtCMZUjLlAsKKecKDzKVvCFL0sFx7dx4RLU3Pa73D0EKVlcBWYVeVYm8FFJwzljOKhtm7o5Gt0YdKPgeHIWhu9zKuu+oR+dv1GeH9g8cX60k42UuBM8DzsTpSJ3fLIuaZWVdlJzJTIlUYFkKOKzINC2JAg8heo3O7bHtjCaVHvt+SVprxmHW59gokIAgGo6KY6GUrJHlwePdOK/hiGFRrwQ50oijDYY9gg8wKgtJ21RfTgkkpxHtZ/KdU+E50ejJ25JEQvD5Rx9sBtudweNWq8F02t//cg1y50Mv6Nebp93LlsQLY6HF+HmxjHOLOdRijnsA93M1TV8FlHUT/wEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-676",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "356"
+      "355"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:08:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "105"
+      "43"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_queryLogs.gz_1.json b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_queryLogs.gz_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_queryLogs.gz_1.json
rename to test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_queryLogs.gz_1.json
index ad359d85d6..660e5617df 100644
--- a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_queryLogs.gz_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_queryLogs.gz_1.json
@@ -2,16 +2,16 @@
   "Body": "H4sIAAAAAAAA/wEAAP//AAAAAAAAAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829/queryLogs.gz",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-676/queryLogs.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"e2e-data-federation-829_2025-03-26T16:37:47Z_2025-03-26T16:37:57Z_queries.log.gz\""
+      "attachment; filename=\"e2e-data-federation-676_2025-03-28T05:08:08Z_2025-03-28T05:08:18Z_queries.log.gz\""
     ],
     "Content-Type": [
       "application/gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:58 GMT"
+      "Fri, 28 Mar 2025 05:08:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1194"
+      "1158"
     ],
     "X-Java-Method": [
       "ApiAtlasDataFederationResource::queryLogsForTenant"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json b/test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
rename to test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
index 8e9cc5e946..994fc20473 100644
--- a/test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-676_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJjbG91ZFByb3ZpZGVyQ29uZmlnIjp7ImF3cyI6eyJleHRlcm5hbElkIjoiYzY5NTZjNDAtZjdmMy00MDRlLTgxMjMtYTEyMmRlYjYxNjJmIiwiaWFtQXNzdW1lZFJvbGVBUk4iOiJhcm46YXdzOmlhbTo6MzU4MzYzMjIwMDUwOnJvbGUvbW9uZ29kYi1hdGxhcy1hcGl4LWF0bGFzY2xpLXRlc3QiLCJpYW1Vc2VyQVJOIjoiYXJuOmF3czppYW06OjI5OTYwMjg1MzMyNTpyb290Iiwicm9sZUlkIjoiNjdjMDQ4Yzc4MjA2NGQzMTNlODgzYWI5In19LCJkYXRhUHJvY2Vzc1JlZ2lvbiI6eyJjbG91ZFByb3ZpZGVyIjoiQVdTIiwicmVnaW9uIjoiVklSR0lOSUFfVVNBIn0sImdyb3VwSWQiOiI1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUiLCJob3N0bmFtZXMiOlsiZTJlLWRhdGEtZmVkZXJhdGlvbi04MjktZzFueHEudmlyZ2luaWEtdXNhLmEucXVlcnkubW9uZ29kYi1kZXYubmV0Il0sIm5hbWUiOiJlMmUtZGF0YS1mZWRlcmF0aW9uLTgyOSIsInByaXZhdGVFbmRwb2ludEhvc3RuYW1lcyI6W10sInN0YXRlIjoiQUNUSVZFIiwic3RvcmFnZSI6eyJzdG9yZXMiOiBudWxsLCAiZGF0YWJhc2VzIjogbnVsbH19",
+  "Body": "eyJjbG91ZFByb3ZpZGVyQ29uZmlnIjp7ImF3cyI6eyJleHRlcm5hbElkIjoiYzY5NTZjNDAtZjdmMy00MDRlLTgxMjMtYTEyMmRlYjYxNjJmIiwiaWFtQXNzdW1lZFJvbGVBUk4iOiJhcm46YXdzOmlhbTo6MzU4MzYzMjIwMDUwOnJvbGUvbW9uZ29kYi1hdGxhcy1hcGl4LWF0bGFzY2xpLXRlc3QiLCJpYW1Vc2VyQVJOIjoiYXJuOmF3czppYW06OjI5OTYwMjg1MzMyNTpyb290Iiwicm9sZUlkIjoiNjdjMDQ4Yzc4MjA2NGQzMTNlODgzYWI5In19LCJkYXRhUHJvY2Vzc1JlZ2lvbiI6eyJjbG91ZFByb3ZpZGVyIjoiQVdTIiwicmVnaW9uIjoiVklSR0lOSUFfVVNBIn0sImdyb3VwSWQiOiI1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUiLCJob3N0bmFtZXMiOlsiZTJlLWRhdGEtZmVkZXJhdGlvbi02NzYtZzFueHEudmlyZ2luaWEtdXNhLmEucXVlcnkubW9uZ29kYi1kZXYubmV0Il0sIm5hbWUiOiJlMmUtZGF0YS1mZWRlcmF0aW9uLTY3NiIsInByaXZhdGVFbmRwb2ludEhvc3RuYW1lcyI6W10sInN0YXRlIjoiQUNUSVZFIiwic3RvcmFnZSI6eyJzdG9yZXMiOiBudWxsLCAiZGF0YWJhc2VzIjogbnVsbH19",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-676",
   "Headers": {
     "Content-Length": [
       "567"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:57 GMT"
+      "Fri, 28 Mar 2025 05:08:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "175"
+      "124"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json b/test/e2e/.snapshots/TestDataFederation/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
index 2e56f06a46..189359a218 100644
--- a/test/e2e/.snapshots/TestDataFederation/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rluQ6OnbhJtqqqRBeEKmBBDNf4EiKldmo7pajKf8dOBWKAySffve/5na+k7s2oHq05dwrtxuima0l1JfDh4oEXj1ZDv1OkIrUsc1lnjDarRtCMZUiLlAsKKecKDzKVvCFL0sFx7dx4RLU3Pa73D0EKVlcBWYVeVYm8EFJwzljOKhtm7o5Gt0YdKPgeHIWhu9zKuu+oR+dv1GeH9g8cL0vJeJELwfOAM3E6Uuc3y1XNsqJeFZzJTIlUYFEIOJRkmpZEgYcQvUbn9th2RpNKj32/JK014zDrc2wUSEAQDUfFcaWUrJHlwePdOK/hiGFRrwQ50oijDYY9gg8wWvCStqm+nBJITiPaz+Q7p8JzotGTtyWJhODzjz7YDLY7g8etVoPptL//5Rrkzode0K83T7uXLYkXxkKL8fNiGecWc6jFHPcA7udqmr4AxGYE9P8BAAA=",
+  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rluQ6OnThptqqqRBeEKmBBDNf4EiKldmo7pajKf8dOBWKAySffve/5na+k7s2oHq05dwrtxuima0l1JfDh4oEXj1ZDv1OkIrVc5bLOGG2KRtCMZUjLlAsKKecKDzKVvCFL0sFx7dx4RLU3Pa73D0EKVlcBWYVeVYm8FFJwzljOKhtm7o5Gt0YdKPgeHIWhu9zKuu+oR+dv1GeH9g8cX60k42UuBM8DzsTpSJ3fLIuaZWVdlJzJTIlUYFkKOKzINC2JAg8heo3O7bHtjCaVHvt+SVprxmHW59gokIAgGo6KY6GUrJHlwePdOK/hiGFRrwQ50oijDYY9gg8wKgtJ21RfTgkkpxHtZ/KdU+E50ejJ25JEQvD5Rx9sBtudweNWq8F02t//cg1y50Mv6Nebp93LlsQLY6HF+HmxjHOLOdRijnsA93M1TV8FlHUT/wEAAA==",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "356"
+      "355"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:55 GMT"
+      "Fri, 28 Mar 2025 05:08:16 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "468"
+      "477"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/memory.json b/test/e2e/.snapshots/TestDataFederation/memory.json
index ff5ccc1cdd..3d15de8d61 100644
--- a/test/e2e/.snapshots/TestDataFederation/memory.json
+++ b/test/e2e/.snapshots/TestDataFederation/memory.json
@@ -1 +1 @@
-{"rand":"Az0="}
\ No newline at end of file
+{"rand":"AqQ="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe7186_1.json
similarity index 77%
rename from test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
rename to test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe7186_1.json
index 962695c0b3..0f0ccba16d 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe7186_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d5f977b2776f7a7508c/privateNetworkSettings/endpointIds/vpce-0fcd9d80bbafe5025",
+  "Path": "/api/atlas/v2/groups/67e62eb058616125063f136f/privateNetworkSettings/endpointIds/vpce-0fcd9d80bbafe7186",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:55 GMT"
+      "Fri, 28 Mar 2025 05:08:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "69"
+      "65"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
rename to test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_1.json
index 4aee0cded2..8b850f4abd 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAEWOUUvDMBSF/0se9rQtbbHLVihS1AeZzMEEH0QkTW66sDQJyU1Fxv67cSK+nXPu4Z7vTIy2p0iatzM5BlCkIUdEHxtKhXFJLiRMy9HZwcl+KdxIudeUo+GRThUdgks+0hWDm0rWasNYXzG2UoyzulgL6oOeOMIO8NOF0wEQtR0iBSu90xYfZbzVVpgk4c4liy2GBDPPB9ilsS1nGmGMewj7nLRlUZA5CWAyYgSjyOX9x8Zk8Bc/041gMZ//1Jz8L+V48gIWhRJyI9dF33MFdVHVueWDm7SEkDvd6yEHETmm/JU8b7PDLw9Z33cv3cdTt324LqNDbq7UpCkv37DF3vpHAQAA",
+  "Body": "H4sIAAAAAAAAAEWOUUvDMBSF/0se9rQtSceyWihS1AeZzMEEH0QkbW67sDQJyU1Fxv67cSK+nXPu4Z7vTIy2p0iqtzM5BuhJRY6IPlaUdsYltVAwLUdnB6faZedGKr2mEo2MdCroEFzykYoNiAJati4FF7xYM7Hq+Ur01Ac9SYQd4KcLpwMgajtEClZ5py0+qnirbWeSgjuXLNYYEsy8HGCXxprPNMIY9xD2Oak5Y2ROApiMGMH05PL+Y2My+Iuf6UawmM9/ak7+l3I8+Q4WrO/UjSpZ28oeNrwUueWDm7SCkDvN6yEHESWm/JU8b7PDLw9Z3zcvzcdTs324LqNDaa7UpOKXb7DdL25HAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5f977b2776f7a7508c/privateNetworkSettings/endpointIds",
+  "Path": "/api/atlas/v2/groups/67e62eb058616125063f136f/privateNetworkSettings/endpointIds",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:55 GMT"
+      "Fri, 28 Mar 2025 05:08:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "33"
+      "26"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe7186_1.json
similarity index 74%
rename from test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
rename to test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe7186_1.json
index 0044b33d8f..0eec3e966f 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe7186_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAKtWSs7PzU3NK1GygrN0lFLzUgryM/NKPFOAwmUFyam6BmnJKZYpFgZJSYlpqaYGRqZAVQVF+WWZKalFQDWO4cFAgeKSxJLSYiDX3xvIK6ksSAWyXRxDHON9HL1dlWoBo2Y07m0AAAA=",
+  "Body": "H4sIAAAAAAAAAKtWSs7PzU3NK1GygrN0lFLzUgryM/NKPFOAwmUFyam6BmnJKZYpFgZJSYlpqeaGFmZAVQVF+WWZKalFQDWO4cFAgeKSxJLSYiDX3xvIK6ksSAWyXRxDHON9HL1dlWoBAjwSem0AAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5f977b2776f7a7508c/privateNetworkSettings/endpointIds/vpce-0fcd9d80bbafe5025",
+  "Path": "/api/atlas/v2/groups/67e62eb058616125063f136f/privateNetworkSettings/endpointIds/vpce-0fcd9d80bbafe7186",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
+      "Fri, 28 Mar 2025 05:08:02 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "35"
+      "28"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
index bb21a697b7..d7dce04729 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUQUvDQBCF/8uek27cNNmam4iCN0FFUDxMdybt4mY37GzqofS/m1Ks9iK55Dwf733wYPbCuIETxdsw+CSaIhMmEiRC0QhVqCovylzVz1d1U+qmWr6JTNjjrda0VFi111qvldZ1q0FXxcqMd2f9J4vmfS+2kdqR3abUcyOlcWHAHGm36ILfBFwvTOgk9FZCcsByp+QmhqFn+U96JDdGMrlWHLIZKqQJPoH1FPncdpF+kfwHnsnmNM8klx90HhOEBGtgeuFpOpf8PE49TXM5cTM5xGCImSZ5nNl5XL62NpGznCa4/LKHj0x46GjEj6PdE1KEZIN/jHY3/oI7j32wPvHN61NOinJV6bEgxM3D8RVU1CLUKwVlqwgVacTaIC3F4RsiZt4FXgQAAA==",
+  "Body": "H4sIAAAAAAAAALWUwUrEMBRF/yXrdpKm00zpTkTBnaAiKC7S5LUNpknJS+timH+3ZXB0NtJN1+9w74EL70iUHTFCuPWji6RiCVEBZARNKsIZL1KWp7x8ZkXFyorxN5IQs9zEAQSHmhWlyETGCybyJstFM9+tcZ9Iqvcj6QI0M9vFOGBFqbJ+1KmGadd713pd75TvqRwMldFKpBOnbfDjgPSf9AB2jkSwDTklG1RQ5V2UxkHAS9tV+lXyH3gjm/M8q1x+0G1MtIyylggvuE7nmt/GaYB1LmduI4fgFSDCKo8Lu43LV2ciWINxhcsve/pIiJM9zPgy2j1oCDIa7x6DmeZfcOf04I2LePP6lAKH9LAXc4EP7cPyCgpotBQll3nDQXM4aC2Uhj05fQMrKhwoXgQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:51 GMT"
+      "Fri, 28 Mar 2025 05:08:00 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2857"
+      "2026"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
rename to test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_1.json
index 620469cad0..6ae50c1582 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e62eb058616125063f136f_privateNetworkSettings_endpointIds_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAEVO3WrCMBh9l1zsSk1arNGCjDJ3MRxOcLALGSNtvtRgmoTkS8cQ331xY+zu/HHOuRCj7TmS+nghpwCK1OSE6GNNaWdcklMJ42xwtneynXVuoMJrKtCISMeS9sElH+mCw7yUlVpx3pacLxQXvGLLjvqgR4GwA/x04XwARG37SMFK77TFJxnvvehhl4Z1cacRhriHsM/KumCMTEgAkw9FMIpc3280JoO/Z/OXASxm+w9NyH9vlkffwZSpTq7kkrWtUFCxssopH9yoJYScad4OWYgoMOVW8rLNDL88ZLxpXpuP52b7+LOMDoV5cOk2WFy/AfBB3741AQAA",
+  "Body": "H4sIAAAAAAAAAEVOzUoDMRh8lxw8tU2ypWldKLKoB6nUQgUPRSS7+bINzSYh+bIipe9uqoi3+WNmzsQad0qkPpzJMYImNTkihlRT2lmf1VTBOBu8671qZ50fqAyGSrQy0bGiffQ5JCqWICpo2WIluODVgom55nOhaYhmlAhbwE8fT3tANK5PFJwK3jh8UukuyB62eVjzG4MwpB3EXVHWnDEyIRFsOZTAanJ5v9KULf6eLV8GcFjsPzQh/71FHkMHU6Y7datWrG2lhiVfiZIK0Y9GQSyZ5m1fhIQSc2klL5vC8CtAwQ/Na/Px3Gwef5bRo7T3Pl8H+eUb6M/RoTUBAAA=",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5f977b2776f7a7508c/privateNetworkSettings/endpointIds",
+  "Path": "/api/atlas/v2/groups/67e62eb058616125063f136f/privateNetworkSettings/endpointIds",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "258"
+      "257"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
+      "Fri, 28 Mar 2025 05:08:02 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "79"
+      "76"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/memory.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/memory.json
index b18627e700..b46899a419 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/memory.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/memory.json
@@ -1 +1 @@
-{"rand":"D7k="}
\ No newline at end of file
+{"rand":"GCo="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_1.json
similarity index 85%
rename from test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_1.json
index 6b9a87e9d6..dba5d9dd19 100644
--- a/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-573",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:00 GMT"
+      "Fri, 28 Mar 2025 05:07:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "168"
+      "181"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
similarity index 83%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
index c8929490c5..baf5ce2d6e 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707/limits/bytesProcessed.query",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-573/limits/bytesProcessed.query",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:07:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "97"
+      "64"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_1.json
similarity index 69%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_1.json
index 7727d6a681..5faf4fd2e5 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAALWOvQ6CMBRG36UzNW0Rqozq5h+DLhqHK70oCbaxvZgQ47tbYnwAB7/xO2c4xyerOu/R0j7ABVkhEtZCoLUzTd2gWQDFkymhMi5SrvKdzItUF9n4wBJm4TbQc08YSu8qDAHN6N6h7yMltGBp83FQITdAwGs06IEaZ7kWOmoPaLtoSDkR372SP2TdnKVrO4S5B3rf2dK1TdVHcbbazpe/B4vpNJMyV1rrPDaf3szqmcVMAQAA",
+  "Body": "H4sIAAAAAAAAALWOvQ6CMBRG36UzNaUEiozq5h+DLhqHK70oCbSxvZAQ47tbYnwAB7/xO2c45yereufQ0NHDDVkhItaCp63VTd2gXgGFk0khUy4SLvODSAuhCqlOLGIGuoleR0JfOluh96hnjx7dGCihAUO7j4MSuQYCXqNGB9RYw1OVBG2Atg9GHOfiu1f0h6zOGrq3U5gd0LnelLZtqjGIi81+uf49WMznaRxnUimVhebLG6V6AuZMAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707/limits",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-573/limits",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:55 GMT"
+      "Fri, 28 Mar 2025 05:07:28 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "45"
+      "46"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
similarity index 71%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
index 79b4fcb012..99e4f15343 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAADXKsQ7CIBSF4XdhLgaoLYbZtcZBF7drOTVNKkS4mDTGdxdjPOP5v5cYS0oIfM50g3CqEQtlHqKfpxl+T1xPYZTppGql6U+6d6113fYiGhHo/q3XlZGPKY7IGX7zKEhrrYxAgQ8/AwPpiUlO8EjEcwzSKlvZk5ZShdY79d/7A6tJ6ZSWAAAA",
+  "Body": "H4sIAAAAAAAAADXKMQvCMBCG4f9ycyPXlJCS2VVx0MXtbK4SqAlNLkIR/7sR8Ru/93nBVHPmKJdCdwaHHSxU5JB8mAP7PUk7QaM2CgelxzMah9Zpe4UOIj2+9bYJl1NOE5fCfrdWzlurwpGiHH+GNStPQmpmz5kkpKiMHRp70lKb6PsR/3t/ANsfx7mWAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707/limits/bytesProcessed.query",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-573/limits/bytesProcessed.query",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:55 GMT"
+      "Fri, 28 Mar 2025 05:07:28 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "123"
+      "31"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
index 063ec0bd7d..b4bb0f3649 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-573_limits_bytesProcessed.query_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJjdXJyZW50VXNhZ2UiOjAsImxhc3RNb2RpZmllZERhdGUiOiIyMDI1LTAzLTI2VDE2OjM3OjU0WiIsIm5hbWUiOiJieXRlc1Byb2Nlc3NlZC5xdWVyeSIsInRlbmFudE5hbWUiOiJlMmUtZGF0YS1mZWRlcmF0aW9uLTcwNyIsInZhbHVlIjoxMTgwMDAwMDAwMDB9",
+  "Body": "eyJjdXJyZW50VXNhZ2UiOjAsImxhc3RNb2RpZmllZERhdGUiOiIyMDI1LTAzLTI4VDA1OjA3OjI3WiIsIm5hbWUiOiJieXRlc1Byb2Nlc3NlZC5xdWVyeSIsInRlbmFudE5hbWUiOiJlMmUtZGF0YS1mZWRlcmF0aW9uLTU3MyIsInZhbHVlIjoxMTgwMDAwMDAwMDB9",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707/limits/bytesProcessed.query",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-573/limits/bytesProcessed.query",
   "Headers": {
     "Content-Length": [
       "150"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
+      "Fri, 28 Mar 2025 05:07:27 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "87"
+      "65"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
index 8b2ad41725..3bbd390a17 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAHWRzU7DMBCEX6XyOS6OnTg/t6qqRC8IVcAFcdjEmxApsVvbKUVV3x27FYgDnLzy7nzjWZ9JO5pZPVpzHBTatdHd0JP6TODDxQNPHq2GcatITVpZ5bLNGO2KTtCMZUjLlAsKKecKG5lK3pGEDDCtnJsnVDsz4mr3EKRgdR2QdejVtchLIQXnjOWstmHmbjK6N6qh4EdwFPbD6Va240A9On+jPju0f+B4VUnGy1wIngecidORen2zLFqWlW1RciYzJVKBZSmgqcjlkhAFHkL0Fp3bYT8YTWo9j2NCemvm/VWfY6dAAoLoOCqOhVKyRZYHj3fjvIYJw6JeCXKkEUc7DHsEH2C0YAXtU306LGF5mNF+Lr9zKjwuNXrylpBICD7/6IPN3g5H8LjRam8G7e9/uQa586EX9Kv10/ZlQ+KFsdBj/LxYxrnFNdTiGrcB93N1uXwBkTyQ7f8BAAA=",
+  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rluQ6OnThptqqqRBeEKmBBDNf4EiKldmo7pajKf8dOBWKAySffve/5na+k7s2oHq05dwrtxuima0l1JfDh4oEXj1ZDv1OkIrVc5bLOGG2KRtCMZUjLlAsKKecKDzKVvCFL0sFx7dx4RLU3Pa73D0EKVlcBWYVeVYm8FFJwzljOKhtm7o5Gt0YdKPgeHIWhu9zKuu+oR+dv1GeH9g8cX60k42UuBM8DzsTpSJ3fLIuaZWVdlJzJTIlUYFkKOKzINC2JAg8heo3O7bHtjCaVHvt+SVprxmHW59gokIAgGo6KY6GUrJHlwePdOK/hiGFRrwQ50oijDYY9gg8wmheCtqm+nBJITiPaz+Q7p8JzotGTtyWJhODzjz7YDLY7g8etVoPptL//5Rrkzode0K83T7uXLYkXxkKL8fNiGecWc6jFHPcA7udqmr4As0nMi/8BAAA=",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:53 GMT"
+      "Fri, 28 Mar 2025 05:07:26 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "848"
+      "455"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/memory.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/memory.json
index 3fafbe2101..aa97a94671 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/memory.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/memory.json
@@ -1 +1 @@
-{"rand":"AsM="}
\ No newline at end of file
+{"rand":"Aj0="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json b/test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e62e8458616125063f0dc4_1.json
similarity index 84%
rename from test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
rename to test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e62e8458616125063f0dc4_1.json
index 792d143ac1..fa1e5c8666 100644
--- a/test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
+++ b/test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e62e8458616125063f0dc4_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets/67e42d93977b2776f7a75700",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets/67e62e8458616125063f0dc4",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:45 GMT"
+      "Fri, 28 Mar 2025 05:07:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "99"
+      "127"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json b/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
index c783d0aff4..3f590d8e6e 100644
--- a/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
+++ b/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAMVbTW8kxw39Lzr4tGsVWSxWcQEjSHLKxTCSQw6BEbCKpC2sdrWQRoYBw/89HAVwxrmHgS6j7pnp10XW+2BLv9w9Pnz++HL34R+/3P347HH34e7Hy+XLy4f7+/P49GrvzX/6+tPT5x+ebH99nj7d65eHe7086sv9T3j/w/PT65eX++FhyuraA93Qpxkfb+N+6/n4+uXef/7y9Hz50+v56JeXPzx8Po+v5n9+ev18+eby/OpffdEf/NvXT9/AVw8X//TynT9/l0e+gdbu3t09+2OCevHHuPv13f8R5H9D+w01/gbys/98ufv1++uvL6+Pl3+v6j8fLE/xGMw6Aox23+0oRd9z7fzsfrvkt/rJ831vd3EeH947+vuLv+SXvLt7u8nvnp9+ejB/zjf98e9/y6MP+umvT4/+l7evbwB9ixwfeY/dJrpOGvS2ZL8hmDSVbcjyiSw9KES8FMGJsNgKJxar7FBatQjYndqaLMSbrJ2BhC6VCKac0zuMMYi7dBqG1KJ0DeYCCEfDQbPRTDgOvRRB4FRgPu0smB2E0ZqWVqGtkCy+44A258LYvbYPRu9m1p14dQgmyw9o6RqMt7pTtoIcliXc8nVpJ84pdhq3JAEaokbA3ms58RzHth1FVlPsRif7snQvXO/eoMm0gdIOm8gs7YPkRFuzRdsj2UDnwCYdqvlguiMAJB/rlrFNqJYPyMbQDj4maBvIwLvV6oJxR+Om5CkMjWKZlyIYfTRcPnbMBkTCK2iU7oWRK5CHl9HKl4uFqZ9T65FGEuGNRxpDfNQy0hQhT4FCBdlDWiiUciKnKqZHy1qs3lMkXU9rpWuQjJTieMNIoG61PrEZ6QbG1OVk5Tl737uWE7315CNdI6GIBNrY3YpZeexzy8pqVtoH6ZXbnntmAwIbstrkqPWJaQ465/pL9LFotVySVVqFudhiyQIakNsyuSDrUMvKZ+b1e8eGHXrEgh21VbhyorZbBIdGrS5cEazfI+BqThwEt5x4Zi0nXvNCX7/LC6ile+FKCB5n8sjzLQF4OqbaKtD2nZkhNtm0PQhn0CpFMA6jhnSBFOoOrNt2rTbGYAnqmVcxeyAVQklqc+MS7Zha4Gf1vbIrT3htFVYezksL9M6czp0paucHLCo+Vyc8aRZtwdWmYWkVehKSNtxLOzXlkDOxdpa2pHWapDhwIpFpl17bB2bLeecGaJ622RbZqtWFCRLZCGlT0eZqkYFpS+k070rKgLcTzT5PqVcefSnlXSvoAVyCxKS107y5VsrxnFkDaOINj9ZzYrPfcyKX7oUxQuikKmOG9+6EG5IgatdgrnMsLD07Xyf8omq1c6S1mNBizMTSecQ5vdgjDV/dVhtuyukX51lcmxeunQiyrW9TYvbJGV1rJ5ptb8Kb9I4yonSWJpbiaLjg2oeiWY/FUNoHa2RwphkI0dA5STo1uhSBGKZN1gxN5oN5ZXAlL3WqChNnp+XNvZNYC+Io1cYtCMezDO5GeRqX2yr1BweHc945HwDwFCZAjFJWNpp2JK7TNGxmPQm6n1J13muPwEzOEUHIka2Atbtxr5Pm6AaBUpPSKiSCZRlbdie+PmzSDI+12ngC/ZhG285tjp5e1aiUlR38pCAmDxmNyAiJqZGlLm3BZEmDQmlThkS6BHcvRiAEAZmTZBNhssNGL+2DRYB8DiuEtxU716NLqUPReXR0lziokG7JQTI8VPfB5kV9rJNGZWeC71g60Vxg6AE0dPgcbV97kkq1UXkkCW48fac1mccja1LKytl+QtJnOgNDlohjc5Q+a3PYQ91lzJSH5MR0KR1KtdE5Qrw3HXoax2lwHSiWduLpkj+bZeLVsOFeq3aWppG7cLVD1jbaOrxTJkrXIBGYULSZeTXfT/P6CLZ0Nx5sc5mCQ1C3s73Jqe2DRLD43CLQDsVeGVH2f7wy5M7A0hlKbgWRDSNTu3D2Y3rnibVrwJxkzHZGCAvObMbcnaUIlKceIlLU2blHD92l2qixcRBsbbtBa23OgVKbF6ANhLW5XVWhmXj2QalDybwQJjd5YUBo6fOF5APQfssHHNVunVvMAGi6G8U+18RQm1yRoWV61rUb++iZ2oxLZyi7Bxtry23ZyF25rTRLpQiY98KeNr0x7UzOY0mtP0hdoMG3urCb1mZnxugZGgbrvmqDRfgsrcKCZVNuEgtIq/3LOEmP3vbtPLFvmKW6kFkBl1NHXW00tg7ApbpgE3jMZALPnDDQYo1x/vcO5ft3d5eniz6+/T/M3QfIbvj1X+u7QCY7NAAA",
+  "Body": "H4sIAAAAAAAAAMVbTW8kxw39Lzr4tGtVsUhWcQEjSHLKxTCSQw6BEbCKpC2sdrWQRoYBw/89HAVwxrmHgS6j7pnp10XW+2BLv9w9Pnz++HL34R+/3P347HH34e7Hy+XLy4f7+/P49GrvzX/6+tPT5x+ebH99nj7d65eHe7086sv9T3D/w/PT65eXe/IwZXUdAW7g04yPN7rfej6+frn3n788PV/+9Ho++uXlDw+fz+Or+Z+fXj9fvrk8v/pXX/QH//b10zf9q4eLf3r5zp+/yyPf9Nbu3t09+2OCevHHuPv13f8R5H9D+w01/Abys/98ufv1++uvL6+Pl3+v6j8fLE8xEbNSdMM9djuKMfZcOz+73y75rX7yfN/bXZzHh/cO/v7iL/kl7+7ebvK756efHsyf801//Pvf8uiDfvrr06P/5e3rW+9jixynvMdhE1wnEr4t2W8IJk5lI1k+gWUEhoiXIjgRFlv7icUqOxRXLQJ2x7YmC/JGa4cAwaUSwZRzxuhEhDxkIBlgi9I1mKv3cDAgnA1nwvE+ShEETO3Mp53V5+jCYE1Lq9BWSBbfgXqbc0HsUdsHNIaZDUdeowej5Qe0dA3ore6YrSCHZQm3fF3aiXOKncYtSQBJ1LCzj1pOPMehbQeR1RSG4cm+LN0L17u33mQagbTDJjJL+yA50dZs0TYlG+gkaDJ6NR9Md+i9Jx/rFtomWMsHaEQ6utPs2gi48261umA8wLgpegpDw1jmpQhoUIPltGO2jii8Aql0L1CuQB5ehitfLhbGcU6tR6IkwhuPRCROtYw0RdBToEC7bJIW2ks5kVMV06NlLdYYKZKup7XSNUhGSnG8YaSubrU+sRnq7gypy8nKc46xdy0nehvJR7oooYgEGO1hxaxM+9yyspqV9kF65bbnntmAnQ1YbXLU+sQ0B4Nz/SUGLVwtl2SVVmEutliyOlLPbZlckHWoZeUz8/pjQIPRR8TqO2qrcOVEbbcIDlKtLlwRrN8j4GpOJOy3nHhmLSde88JYv8sLoKV74UoIHmcy5fmWADwdU20VcPvOzBAbbdomhBm4ShHQYdCQIT2FenTWbbtWG4NYAkfmVcgeSIVQlNrcuEQHpBb4WWOv7MoTXluFlYfz0tLHYE7nzhi18wMWFZ9rIJw0i7b61aZBaRVGEpI22EsHNuWQM6F2lrakDZyoQDAB0XTIqO0Ds+W8cwM0T9tsC23V6sLsEtkIaVPB5mqRgWlL6TTvSsodbieaY55Sr0xjKeZda9fTYQkgo9ZO8+ZaKcdzZg16E29wtJ4Tm/2eE7l0LxCF4ElVhgzvwxF2T4KoXYO5zrGw9Ox8nfCLqtXOkdZiBAuaiWUwxTmj2CORr2GrkZty+sV5FtfmhWsndtk2tiky++SMrrUTzbY3wk16B6EonaWJpTgarH7tQ9Gsx+Je2geLMjjjDOjRwDlJOjW6FIEYpE3WDE3mxLwyuKKXOlXtE+bA5c19oFgL5CjVxi3Qj2cZ3A3zNCy3VeoPDpBz3jmf3runMHWAKGVlw2lH4jpNg2Y2kqDHKVXnvTYFZHKOCASObAWo3Y17nTRHNwgUm5RWIREsy9iyB/L1YZNmeKzVxhPgxzTadm6TRnpVw1JW9u4nBTF5yJAiIySkRpa6tNUnSxoUTJtCEukS3L0YgWCPnjlJNiIkO2zw0j5Y2IHPYe3hbcXO9RhS6lB0HqXhEge0p1vyLhkeqvtg88JB66RR2ZngB5RONFc38OhISj6p7WtPYqk2KlOS4IYzdlqTeTyyJqWsnO0nKGOmMzBgiTg2qfRZm/dN6i40Ux6SE9OljF6qjc4R4qMp6Wkcp/XrQLG0E8+Q/NksE66GDfZatbM0jdyFqx20tsHW4Z0yUboGicAEo83Mq/l+nNdHsKW78UCby7R7Dxx2tjc5tX2QCBafWwQ6erFXBpD9H6/cc2dA6Qwlt4LI7pSpXTj7Mb3zhNo1YE4yZjsUwgIzmzF3ZykC5akHERV0Dh4xQnepNmpsIOxb2269tTYngdTmhd4I+trcrqrQTDz7oNShZF4Ik5u8QD209PlC8kHXccsHHNVunVvM6L3pbhj7XBNDbXIF7i3Ts67d2GlkajMunaHsEWysLbdlQ3flttIslSJg3gtG2vTGuDM505Jaf5C6gMS3urCb1mZnhhgZGoh1X7XBInyWVmH1ZVNuEkuXVvuXcZIeve3beeLYfZbqQmYFWI4DdDVqbKN3LtUFm51pJhN45gQCi0V0/vcO5ft3d5eniz6+/T/M3YdOi3/9FywtAWk7NAAA",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets",
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:44 GMT"
+      "Fri, 28 Mar 2025 05:07:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "160"
+      "129"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json b/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e62e8458616125063f0dc4_1.json
similarity index 73%
rename from test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
rename to test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e62e8458616125063f0dc4_1.json
index 6b00fd0be1..d943274288 100644
--- a/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
+++ b/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e62e8458616125063f0dc4_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAACXMsQ7CIBCA4Xe52SYIyIGbYxdj7OBo4DgNESRpqYvx3Uvi+ufL/4V7inAEg6xldMohBoloHujxgELADsJKL25nX7i7Ut/PSjkNLHlovLSlC8p1jZe5flLkuaPTbeo1+XKtmcf/noS2hFYKo6PaK7ZW+eDgtwEfUqTbgQAAAA==",
+  "Body": "H4sIAAAAAAAAACXMPQvCMBCA4f9ys4V89Xq6ObqI1MFR0sspwcRAm3YR/7sB15eH9wP3GOAAOAgaIdcTatSmV2gfKrCDHUwrv6SefZbmcnk/C6fYiZGuylKXJjiVNVzmssUgc0PH27XV6PNYkpz+e1aOeCCj0AWrrRBZP+3h+wPHR3LYgQAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets/67e42d93977b2776f7a75700",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets/67e62e8458616125063f0dc4",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:44 GMT"
+      "Fri, 28 Mar 2025 05:07:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "45"
+      "28"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportBuckets/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json b/test/e2e/.snapshots/TestExportBuckets/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
index 9462156a37..5ad753488c 100644
--- a/test/e2e/.snapshots/TestExportBuckets/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
+++ b/test/e2e/.snapshots/TestExportBuckets/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAACXMsQ7CIBCA4Xe52SYIyIGbYxdj7OBo4DgNESRpqYvx3Uvi+ufL/4V7inAEg6xldMohBoloHujxgELADsJKL25nX7i7Ut/PSjkNLHlovLSlC8p1jZe5flLkuaPTbeo1+XKtmcf/noS2hFYKo6PaK7ZW+eDgtwEfUqTbgQAAAA==",
+  "Body": "H4sIAAAAAAAAACXMPQvCMBCA4f9ys4V89Xq6ObqI1MFR0sspwcRAm3YR/7sB15eH9wP3GOAAOAgaIdcTatSmV2gfKrCDHUwrv6SefZbmcnk/C6fYiZGuylKXJjiVNVzmssUgc0PH27XV6PNYkpz+e1aOeCCj0AWrrRBZP+3h+wPHR3LYgQAAAA==",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:43 GMT"
+      "Fri, 28 Mar 2025 05:07:16 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "302"
+      "236"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json b/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
rename to test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_1.json
index e96a2dec4f..1087e31f09 100644
--- a/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:43 GMT"
+      "Fri, 28 Mar 2025 05:29:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "275"
+      "277"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json b/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
similarity index 83%
rename from test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
rename to test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
index 0fba2261b6..18559809b4 100644
--- a/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/snapshots/67e6304e58616125063f24df",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:42 GMT"
+      "Fri, 28 Mar 2025 05:29:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "113"
+      "105"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_1.json
new file mode 100644
index 0000000000..58d1645108
--- /dev/null
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPbXxJc5nfvMQrMuRSxO66C4ZCsZhEqywZkpwhK/LvoyK3azoU2Ev7EEARycMjkoe+J5TtqCyBjZRc802jqeVKkuSelI2xqlrUII0RI15vQXufQpgoJsn3H2ek4pJXTZVJuhLA0HCllVWlEiQhxTSPbmNyRqwwT8NnigGax9nH9HpakMMZWdHyrqlbEJJY3QBecnSXUFqlHRt4sK6pMGjWQNmVhjVoQPaIZ6BUklG9d4ilQPKgi33tTMvsajoZpXlWIJvSo+Ijc6u53BhEdxEIaGGMPwyIw7h3HnbP42ER9pJwkETDbxjKuLnL+W+4/ECSKOyE/uaGaizDw7M+Xk+nX29v0uUsG2MIktP72mVL7RKMxfrsOAN8Epkv5hl6bIRaUTHyhHMQ6xmVdAMs31LNEPfxxRutmnqCFSA9WDPap0C76xhYDAPG+iWEPUTjzt4fQD+GYX8Q9uN1eTFExwsW9RjaBV2BML55gss7d7wnWywkxm2trU0SBKVQDTtnsOtUSm4UW3VKVQW05gG1gppgFwdHMiZ4iUnQNsA8HM7j/gVxXRPHVok1dumt8gZ+vgKN9VcaPqmVeaRykvok7VPvt+dqJK3NVtn/YfrX9+Ak6SzjDzP6U+nPiH5UMxl2QvJoO7nu9NEgaeWG97RZNW3ME8XV3D6TqIZa8PK4MPIaSj9LL09g+B5cqqY6jjZ6Rw5ig9F+Mfh4nH6xt7w0LSQiSmPdinLSQ+xZFLZanCyucpJ0wxCVCCvzWYmmglbzeZHOx+nSaVCiMkeqkZYkISqdNlblJRVHbeGaU1XdONX/u2NqDYzjqthB9sxiMB7G6pc8NRw8L7cfnqMd0AYCF4+7fI2ndQ+OMFea2z1JBu6PXzVz39v0Jid+bS6k2L9WcX0/25TX+W2W5sVtdBzM30rC5OXhgC7xPm3wNzy+85FaKTsCbdvsk3x5uVwsii8RRiB7+xAyWmZpMZlfum8O3bRbDucZ1/NxSN3Hya/+5/3ceUUssUPUQL5HFVQIOC1ycvgDkWpjZiMHAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "797"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "82"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_2.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_2.json
new file mode 100644
index 0000000000..689911d589
--- /dev/null
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY8aNxD+K5U/5EsO9oXjpSudKgIkooLjxO7l2lTVyayHxT2vvbW9tOTEf894vSTHNVdVlRIJJPDMPDOeeebxI6FsT2UObKLklhe1ppYrSZJHktfGqnJVgTRGTHi1A+19MmGimCS//X5BSi55WZczSTcCGBputLIqV4IkJFuk0X1MLogV5mn4UjFA83T2dny7yMjxgmxo/lBXLQhJrK4BDzm6S8it0q4aOFm3VBg0a6DsRsMWNGD1iGcgV5JRfXCIucDiQWeHypnWs5vFfDJOZxlWk3tUvGRqNZeFcejGUheL8KRUslBskwRBC9KJB5cds0NrJwzx0y0i+fef3davw2DflWCTeBhGw4uvx0T/Iyb+t5jgJ5zJlWvUK1rbXapqncMVZTiPVxoqwXOagr2iVlDTodGehfUJGltwum2q918u/Nro/fmlv15A017svoUpfjE+DuN+J+x14lEW9pNwmESjD5iEcfOQ8o/w7g1JorAb+pM7qrHGEwfe3i4Wv97fjdfL2RRDcJL6ULnRjO0ajEUy7TkDnD+5Xl3P0KMQakPFxNeYgtguqaQFsNTdDXE/06PQqq7mbp592DI6oEB72xhYDEPGBjmEfUTjzj4YwiCG0WAYDuJtfjlCx0sW9RnaBd2AMJ7pgssH9/OR7JB1GLeztjJNw1TNmua0jermqgxoxYOm+8E+DppiTPBSJaeem6fNJ47iouG12GLPv1fewC9joLH/SsPPamM+l3KW+iztU+/vX6uRtDI7Zf9LpV98j06/nGX6Zkn/UPo9ojfSR0ZdtyWt7ey4O0CDpKUj7/mwKlqbJ/JUcftMz9q1bISngtxz6WUGhj+CS1WXDbXRO3IQBUZ7FfXxyH5xsDw3LSQiSrfdObjVQ+xlFLa7OF/dpCTphSFuImzMeyXqElqBTLPx9XS8djsocTMnqpaWJCFuOqqLSnMqmt3CN0GVVe22/p+CXGlgHHV1D7NnFoPxMFV/yXPD0dfl9OE52hFtIFCl3eG3uFrv6ArmSnN7IMnQ/fFSc+1nO75LiX9jVlIcvlVz/TzblLfp/WycZvdRQ8yPSsL8ZXJAj3ifNvgD/vzBR2ql7AS0bbPP0/W79WqV/RJ54benkPl04RTV0qJVOOQySnNDUPeK+zfy+Sz3fhvWOB1qID3gBpQItshScvwEr/n3pUwIAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "899"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:14:53 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "69"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_3.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_3.json
new file mode 100644
index 0000000000..05234c262e
--- /dev/null
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW8iNxD+K5U/3JcL7AvhpStFFQdcRMVLxG4u7VVVZNYDuPHaW9tLy0X89xuvl1xIL1VV6U4CCTwzz4xnnnn8SCjbU5kDGym54dtKU8uVJMkjyStjVbEsQRojRrzcgfY+mTBRTJLffr8gBZe8qIqJpGsBDA03WlmVK0ESks3S6D4mF8QK8zx8rhigeTx5P7ydZeR4QdY0f6jKBoQkGyoM4ClHfwm5VdqVAy/MGii70bABDVg+AhrIlWRUHxxkLrB60NmhdKbV5GY2HQ3TSYbl5B4Vb5lazeXWOHRjqYtFeFIouVVsnQRBA9KKe5cts0NrKwzx095G8u8/241fi8G+LcEmcT+M+hdfj4n+R0z8bzHBTziUK6sreEMru0tVpXO4ogwH8kZDKXhOU7BX1ApqWjTas7A6QWMLTrdN9f7Lhd8avT+/9NcLqNuL3bcwxi/Gx2HcbYWdVjzIwm4S9pNo8BGTMG4eUv4Jrt+RJArboT+5oxprPJHg/e1s9uv93XA1n4wxBCepD6UbzdCuwFhk054zwPmTxXIxQY+tUGsqRr7GFMRmTiXdAkvd3RD3iR5brapy6ubZhQ2jPQq0s4mBxdBnrJdD2EU07uy9PvRiGPT6YS/e5JcDdLxkUZehXdA1COOpLrh8cD8fyQ5Zh3E7a0tTN0xVrG5O06h2roqAljyoux/s46AuxgSvVXLquXnefOIoLmpeiw32/HvlDfw2Bhr7rzT8rNbmqZSz1Gdpn3t//1qNpKXZKftfKv3ie3QC5izjd3P6h9IfEL3WPjJouy1pbGfH7R4aJC0cec+HVdLKPJOnktsnQXNr6gqr17IWnhJyz6XXGRj+CC5VVdTURu/IQWwx2suoj0f2i4PluWkgEVG67c7BrR5iz6Ow2cXp8iYlSScMcRNhbT4oURXQCGSaDRfj4crtoMTNHKlKWpKEuOmoLirNqah3Cx8FVZSV2/p/CnKpgXHU1T28VHKD8TBWf8lzw9HX5fThJdoRbSBQpd3ht7ha5+gK5kpzeyBJ3/3xUrPwsx3epcS/MUspDt+quX6eTcrb9H4yTLP7qCbmJyVh+jo5oEO8TxP8EX/+4CO1UnYE2jbZp+nqerVcZr9EXvjtKWQ8mU2y6eLavdB026gc8hnluSape8r9O/lynnu/ESucEDWQHnALCgScZSk5fgYvDq8hUQgAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "904"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:29:59 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "81"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_4.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_4.json
similarity index 81%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_4.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_4.json
index 2168023a36..4b030b6f5f 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_4.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItODc0IGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItODc0IiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItMjY0IGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItMjY0IiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264",
   "Headers": {
     "Content-Length": [
       "204"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:04:21 GMT"
+      "Fri, 28 Mar 2025 05:33:10 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "82"
+      "58"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_1.json
similarity index 58%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_1.json
index e3e3d269f4..93069912c3 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAIVRy2ojMRD8Fx18siON5uUdMEuSvewlBLKnhBDaUssW1oyGUSsEjP89HSdDMCy7N3V3laqoOorgh0MS3dNR7Cd0ohN7ojF1UpoQs11ZfL3q47CLdntlYi9h9BIoQJKvWu6mmMcka3QWGkAonUarsbW2Mahq/iInwinNj9W6reQWzCGPEt/GOFH66Qc+WryNeaANTRkXI+zwLvebYuEJ+3SP0z1vNoVSYikmDOwxYXDi9Pwxphzo07+ZEAjtNTFAK12vVLnSzZ+i6ap1V6tHZhu2EftfQMAMpn+auMnmgPTbMq9psdKu0mC30NRFCWvT6GYLYsY+EFBmvePXjPY2hoCGfBx4rZaCIkG4XJ6WwvnBp/1f3LWdKrrq7M5/O3AXDkpVOr6PXJB/Y8ws/ZIGGNM+0tzBWl90YLH6bznnTi7iqlpZtFWpVNvqHyw7i/wjIGM+cBwNMuQhG4MpuRzOFX3lwfWKrji9A8nGn55xAgAA",
+  "Body": "H4sIAAAAAAAAAIWRQWvjMBCF/4sOPSWVLMuyawhL273sZSm0p13KokijRES2jDUqhZD/3klb0w0s7E2aeaP59N6RxTAeMut/H9l+Bs96tkeccs+5jam4tYOX6yGNu+S21zYN3EyBG4wm8xfJd3MqU+YNeGe0AVN7CU5C65y2IBp6omSEOS+HtdSKb409lInD65RmzN/CSE0H96mMuMG5wNVkdvCzDJvqKiAM+QHmB6psKiHYis0QiTFD9Oz0fL7mEvGD385gENwtkkAK2axFvZbdk2j6qu2V+EXTljDS8N2goQka/4C4K/YA+MPRnG5B10K5VmjpreroTwp059mifUSDhfYdP+/g7lOMYDGkkcpixTChiZfF04r5MIa8/yedvOmb+kwXvgi8ajpd6Uo2QpOr21pTf6KAwitpltV/8mimvE+4ZNDJiwwcqP+G857JBVCledWquqpvhD5bviz52yC4wFPubFAma4Akj8VayNmX+B7Rpx8UL+ur0xusX6frcQIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/exports",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "378"
+      "388"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:42 GMT"
+      "Fri, 28 Mar 2025 05:29:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "58"
+      "63"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_2.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_2.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_1.json
index b1247f0772..561c199ae6 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_2.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAH2QT0vEMBDFv8ucW5omaVJ7889lb4KeFJHZZKLF2pRkCgvLfncjbJFePM6bN7/HmzO4RMjkbxkGkEJ2tVC1NM+tGXQ/dOIFKnBr5vj9gIwwvL5VQKclJr5b3RfxwZc7Y0nLoCX6I5quVdg7I80RYfM+MfKaYThfZ/L3cZrI8RjnIosKODJOe/FSwfhHDzu6EioU+pIojKfi2bDvecYlf0bOTUfBo+klqiDJS7LeG+dJXxdIuwWJrnFTKUqp7q1udq/QtmmtVkJYK29K7BbyT3nnfn2lNhXLYX5M8SNRznD5ARd+d6ByAQAA",
+  "Body": "H4sIAAAAAAAAAFVQy07EMAz8F59bNU+39LbAhSOCEwihkDiiomyqxpFWWu2/E6StoEfPjGc8PoNfyTGFA8MISijbCt2q4VnYUfajES/QgC+Z0/e9Ywfj61sDdFrSyrfFfxE/hLqHPaEWJvQCVfRmIKcN4RBh0z6x45JhPF9nCndpnsnzlI4VFg1wYjfvwUsD0597NHZAiVJZgTqqD43VfVkpTqeq2Wzf89Et+TNx7izF4HBQrqopKOpDQB/IXAlHO4KE7fxci9LaKjTd7hUSO9kbLfWNQFFjt5D/5Wl3ngm/5XOtTVXyWKhQgMsPTsxpEm4BAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports/67e42ff2adba6513a8c6303f",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/exports/67e630f458616125063f2b36",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "243"
+      "245"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:51:14 GMT"
+      "Fri, 28 Mar 2025 05:17:40 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "69"
+      "60"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_3.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_2.json
similarity index 64%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_3.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_2.json
index 0f2b699989..c3ba7a00ad 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_3.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAH2QQUvEMBCF/8ucW5omaVJzW/XieT0pIrPJhC3WpjRTWFj2vxtlFymIx3nvG97jncEvhExhx+BACtnVQtXSPLfG6d514gUq8Gvm9PmIjOBe3yqg05wWvl/9B/FTKH/GkpZRSwwHNF2rsPdGmgPCjd0z8prBna83hYc0juR5SFORRQWcGMeteKkgDtOQj3+0s060Tv+0G34bxE0DJVQs/rxQHE6FuUW/5wnnfEycm45iQNNLVFFSkGRDMD6QvhpIG4NE1/ixjEFL3VvdbObStmmtVkJYK+9K7C3kn4G8/+bKNFSQ/eo95RzXES5f9P+vpJYBAAA=",
+  "Body": "H4sIAAAAAAAAAFVQy07EMAz8F59bNU+39LbAZW9IcAIhFBIHKkpTNa600mr/nSBtBT16Zjzj8Rn8Qo4pHBh6UELZWuhadU/C9rLtjXiGCvyaOX3fO3bQv7xWQKc5LXy7+i/iYyh72BJqYUIrUEVvOnLaEHYRNu0jO14z9OfrTOEujSN5HtJUYFEBJ3bjHrxUMPy5R2M7lCiVFaijetdY3OeF4nAqms32LU9uzp+Jc2MpBoedckVNQVEbAvpA5ko42hEkbOPHUpSWWqFpdq+Q2MjWaKlvBIoSu4X8L0+780z4LZ9LbSqS4/SwpI+FcobLD5OCybJyAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports/67e42ff2adba6513a8c6303f",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/exports/67e630f458616125063f2b36",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "254"
+      "249"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:41 GMT"
+      "Fri, 28 Mar 2025 05:19:26 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_3.json
similarity index 63%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_1.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_3.json
index be45e7e3d0..56f6b3fd7f 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_67e630f458616125063f2b36_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAH2QS2vEMAyE/4vOCXH8THPr49JjaU8tpWhtmYam6xDLsLDsf68LG0ouPWo0+obRGfxKyBRuGUaQQppWqFbal96OehiNeIUGfMmcvh+QEca39wbotKSV74r/In4M9c460jJqieGA1vQKB2+lPSBs3mdGLhnG83WmcJ/mmTxP6Vhl0QAnxnkvXhqY/uhxR1dCxUpfVorTqXo27Ec+4pI/E+fOUAxoB4kqSgqSXAjWB9LXBdJuQcJ0fq5FaW0Hp7vdK7TreqeVEM7Jmxq7hfxT3vtfX61N1fJUqFCAyw+9CLLUbgEAAA==",
+  "Body": "H4sIAAAAAAAAAG2QzWrDMBCE32XPDtbv2vEtbS89p6eWUlRpRUxdy1hrCIS8exWIaQ097sws8zEX8DM5pnBg6EAJZXdC71T7Imwnm86IV6jAL5nT95NjB93bewV0ntLMD4v/In4O5Q8bQi1MaASq6E1LThvCNsKaPbLjJUN3ud8UHtMwkOc+jUUWFXBiN2zFawWxH/t8+pdO7Turb3T9L0E0tkWJUlmBOqpPjcWfZor9uWTW6o88uimfEufaUgwOW+VKmoKiJgT0gczdcLQxSNjaD2UMmncKTb0BkljLxmip9wJFqV1L/g5EGzwTbgPlMg2VyHHxnnKOywDXH26IbgCWAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports/67e42ff2adba6513a8c6303f",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/exports/67e630f458616125063f2b36",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "238"
+      "261"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:48:50 GMT"
+      "Fri, 28 Mar 2025 05:29:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "42"
+      "24"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
index 444702ee06..c7b8872de4 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1Su3LCMBD8F9U2MsIPxl0yadKkCFTJpDhLZ6PBthQ9mDgM/55jwGRoUqaTdle3e7M6Mmns9IqdNqNn9ftHwhR66bQNhLCaBfQh9SNYvzOBJQy/rHboHwJxIhNFmq1SUW2XZZ0XdZG/kaR1+BlxlNN2skgyMyocYFREaUX3ssJctLkA1UBZLFewlqUopSS+1+P+HOPIdg5b0u5CsL7mXPYmqlThYTGYsTOqWUgzcLCaQ+jB84PgnTPRel5gq6AEhFUrUAmslColZgWNiD6g8/MhXVc5b0Duo+Xzgp7/Ec5hT4k89i07Jf+V8OZ753PncVWzE5VnTa/l9BxwuLbp0BICGwwvMJzbuJ89L36r6mmuygcIkYYw6jLiBTEOOtzob3yc6F+wOktYuDz8tWGnH15Ptu5UAgAA",
+  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOnVjF7KBWFgYaCcQg2u/pFYT2/ijIlT977yqTVEXRjb73fnuns4HopwfX6EzzkbSvH8URENUwfiEE9KQBDGV0Uofty6RgsCXNwHiQ0KMVYyX1aJk9+uKN/O64fUbUtoAnxmsGtejB6Q5q2GQViNkNN7FEsSiqoHfibmYM16JRctq3SLeG7s7xTiQbYAWuduUfGwoVb3LutSwnw3Odk5vZsoNVHpDZeplpHtGu+Cyj5RDq6WQIFEUNIOl1kJBxVEixwQhToeSiZpupNplT6cFI/0jXIAeE0XoW3Is/ivh1ffG58bjwiZHLM+73qjxOcFwaTOAx4lcQXqRw6mNW+1p8WtVT1NVMcmUUYRglxnOExdkByvzDY8j/gvSVAVJ54e/NuT4A6q6sHNUAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/snapshots/67e6304e58616125063f24df",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:55 GMT"
+      "Fri, 28 Mar 2025 05:14:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "63"
+      "29"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_2.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_2.json
similarity index 60%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_2.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_2.json
index 085ec9b686..8c40e799c1 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_2.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOnXzUWUDsbAgRDuBGF7tl9RqYhs/pyJU/e+40BR1Yexm353f3dP5wKR14wu22hpi9dt7whSS9NqFiLCaBaSQkgFHWxtYwvDTaY90FyInMlGk2SIV1Xpe1nlRF/lrlDQePwY0clyPDqPMGoU9GBUpreK9rDAXTS5AbaAs5gtYylKUUka+02Z3inFgW49N1G5DcFRzLjs7qFThftZb01q1mUnbc3CaQ+iA+F7w1tvBES+wUVACwqIRqARWSpUSsyKOGCigp+mQLqucb0DuBsenBYn/E85jFxMRdg07JrdKePG98rnyOKvZMZbnbKfl+BiwP7fp0UUEVhieoD+1cT17WvxS1cNUFQUIQxzCtHn2to2d0w9qPbS40l94P8a/weosYeH38Z8VO34DRXWqjVgCAAA=",
+  "Body": "H4sIAAAAAAAAAL1SsU7DMBT8F89JnbqJC9lALCwI0U4gBtd+Sa0mtvFzKkLVf+cVGlAXRjb73fnuns4Hpn0Yn6C13iGrX14zZgB1tCHRhNUsAaYcnQq49YllDN6DjYA3iTBRiCovFrm4XhdVPS/rqnwmShPhbQCnx/UYgGjeGeiVMwRZQ3e5BLkoSqiu5FzORVXIRSNK0xDeWbc7xTiwbYSGuNuUAtac684PJjewn/Xetd5sZtr3XAXLVeoU8r3gbfRDQF5BY5RUoEgUjIClMVJDUZHEgAkiTodcyJJvlN4NgU8LIv8jXISOEiF0DTtm/5Xwx/fC58LjzGZHKi/4zurxPkF/bjNCoIlaQXpQ/amNS+1p8Z+q7qaqMKk0kAiz7jH6ljrHr6mPqoWV/YDbkf4Gq4uMpe/Hv1bs+AnxDUXvWAIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/snapshots/67e6304e58616125063f24df",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "326"
+      "325"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:59 GMT"
+      "Fri, 28 Mar 2025 05:14:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "53"
+      "83"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_3.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_3.json
similarity index 59%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_3.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_3.json
index c58ae47a84..f4a61831fb 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_3.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsU7DMBT8F89JHNzErbKBWFgQohUDiOHVfkmtJrGxnYpQ9d95pU1RF0Y2+9757uzzninrxmdsjO0Dq97eE6YxKG9cJIRVLGKIaejBhY2NLGH46YzHcBtpJnJRpvksFfPVjayKsiqLV6LUHj8G7NW4Gh0SzfYaO+g1jYymvZxjIepCgF6DLG9msFBSSKVo3pp+e4yxZxuPNXE3MbpQca5aO+hU4y7rbN9Yvc6U7Tg4wyG2EPhO8MbbwQVeYq1BAsKsFqgFzrWWCvOSJIYQ0YdpkS7mBV+D2g6OTxcM/I9wHltKFLCt2SH5r4QX3yufK48zmx2ovBP+QiKn+hZZnknScLY1anyI2J1b9ugIgSXGR+iOLV17Tg9yqfB+qjBEiAOJMNM/edvQXwg/qPXQ4NJ84d1If4ZVecLi6fCvFTt8A0OsGd5wAgAA",
+  "Body": "H4sIAAAAAAAAAL1SwVLDIBT8F85NoDShNTcdL14cx3Y86Hig8JIyTQCBdIyd/ruvtqnTi0dvsG/ZXVj2RDk/PENjnI2kenufEA1RBeMTIqQiCWLKopU+blwiEwKf3gSItwlnnPEyY7OM36xYWU2LqixekVIH+OjBqmE1eECasxo6aTWOjMa9mIOYsQLKhZiKKS+ZmNW80DXOW2O3xxh7sglQI3eTko8Vpap1vc407PLO2cbpda5cR6U3VKZWRrrjtAmu95GWUGspJEgUBc1hrrVQwEqU6GOCEMdFxkVB11Jte0/HC0b6R7gALSaK0NbkMPmvhBffK58rjzObHLC8E/6CIqf6FjnLBWp41xo1PCTozi0H8IjIJaRH2R1buvYcH+RS4f1YYUwy9ShCjH0KrsG/EH9QF2QDS/MFdwP+GVKxCUmnw79W5PANFJbGp3ACAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/snapshots/67e6304e58616125063f24df",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "339"
+      "338"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:07 GMT"
+      "Fri, 28 Mar 2025 05:15:12 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "63"
+      "38"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_4.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_4.json
similarity index 59%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_4.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_4.json
index 21a518147f..6cec6a5d63 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_4.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOHUTp8pWxMKCEK1AAjG49ktqNbGN7VSEqv+d10/UhZHNuXe+O+fejsjODurJ261W4ElN5q8LkhBp3fgMrbYmkPr9IyEKgvTaRUSQFCHENBjhwtpGpMOX0x7CPOKM5axM82nKquWE10VZl8UbUhoPnwMYOS5HB0izRkEvjMKRVvjNKyhYUzChVoKXk6mYSc64lDjvtNkcYuzI2kOD3HWMLtSUHrOnCrZZb01r1SqTtqfCaSpiJwLdMtp6O7hAS2iU4ALEtGGgGFRKcQl5iRJDiODD5ZDOqoKuhNwMjl4eGOgf4Tx0mChA15B98l8Jr743PjceZzbZY3kn/AVFTvXNsjzjqOFsp+X4EKE/t+zBISIWEB9Ff2jp1vPyQ64V3l8qDFHEAUWINrhLLe5COKLWixYW+hvuRtwZUucJiafLv1Zk/wPv5nZKhgIAAA==",
+  "Body": "H4sIAAAAAAAAAL1SsU7DMBT8F89J7LqJW7IVsbAgRCuQQAyu/ZJaTWJjOxWh6r/z2pKiLoxszr3z3Tn39kQ1tteP3u6MBk9KsnhZkoQo64YnqI3tAinf3hOiIShvXEQESRFCTEMnXdjYiHT4dMZDWEScccaLlE1TfrNiRTnJyyJ/RUrl4aOHTg2rwQHSbKehlZ3GkdH4LWYgpiyHYi4mYsILJqYVz3WF88Z022OMPdl4qJC7idGFktJT9lTDLmttV1u9zpRtqXSGytjIQHec1t72LtACKi2FBImioDnMtBYKWIESfYjgw3hIucjpWqpt7+j4wED/COehwUQBmoockv9KePG98rny+GGTA5Z3xp9R5FzfPGOZQA1nG6OG+wjtT8seHCJyCfFBtseWrj3HH3Kp8G6sMEQZexQhpsNdqnEXwgm1XtawNF9wO+DOkJIlJJ4v/1qRwze43KkzhgIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/snapshots/67e6304e58616125063f24df",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:43 GMT"
+      "Fri, 28 Mar 2025 05:16:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "53"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_5.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_5.json
similarity index 58%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_5.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_5.json
index cfea48fb08..2679c3f41b 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_5.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_5.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SwVLCMBD9l5wpKaFNsTccL14cRxid0fGwJFvI0DYxSRkrw7+7gOD04tFbsvv2vZe83TNV204/erszGj0r2fxlwUZMWdc/4drYNrDy7Z0KHiGinkeCiFTkSTpNhFxOZJkVZSZeaUZjUN64SEMEihhiElpwYWMjdfHTGY9hSFCcCGZlJo8ElcePDlvVL3uHBLOtxgZaTS2j6S4LzESVCdArkPlkCjMlhVSK+rVpt0ene7bxWBF2E6MLJeen5yUad+PGtmurV2NlGw7OcIg1BL4TfO1t5wLPsdIgAWFaCdQCC62lwjQnii5E9OFySGZFxlegtp3jlwcG/oc5jzU5ClhX7DD6L4dX3YHOQOMHzQ6U77n+TCTn+GbjdCyJw9naqP4+YvOzCB4dVWCB8QGaY0pDzcuHXCO8u0QYIsQuHAds42qkZToVrYc1LswX3va0Mqyc5NnNNC/SXI5YPJP8SrLDNwSGboixAgAA",
+  "Body": "H4sIAAAAAAAAAL1SwVKDMBD9l5wLgQABudXx4sVxbEdndDykZKGZAolJ6Iid/rtLa+tw8egt2X373kveHkjV6kE+Wr1XEiwpyfJlRRak0mZ8gkbp3pHy7R0LFoQHufQIYRHLgigJWLGOsjLmZcJecUaCq6wyHocQ5MH5wPXCuK322IVPoyy4OcHNiSAvEz4R1BY+BuircT0aQJjuJXSil9hSEu88B55EKWQFj3nMsognNUtljf1W9bvJ6YFsLdSI3XpvXEnp6XmBhH3Y6b7RchNWuqPCKCp8KxzdM9pYPRhHM6il4AIEkoJkkEvJK4gypBicB+suh4DxlG5EtRsMvTzQ0T/MWWjRkYO2JsfFfzm86s50Zho/aHLEfM/1ZyQ5x1eEUciRw+hWVeO9h+5nESwYrIgV+AfRTSnNNS8fco3w7hKh88IPbhrQnWkBl+lU1FY0sFJfcDviypAyztKoSPIk5wvizyS/kuT4DQiJ+cWxAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/snapshots/67e6304e58616125063f24df",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:48:49 GMT"
+      "Fri, 28 Mar 2025 05:17:39 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "64"
+      "56"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
deleted file mode 100644
index a30ba65ef2..0000000000
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPbXzJkrR+8xKvyJBLEbvrLhgKxaITrbJkSHKGtMi/j4rcrukwYC/bQwBFJA8pkuf4kVC2o7IENlay4ptWU8uVJMkjKVtjVb1sQBojxrzZgvY+hTBRTJKv385IzSWv2zqTdC2AoeFaK6tKJUhCilke3cXkjFhhXobPFQM0T7L36c2sIIczsqblfdt0ICSxugW85OguobRKu2rgyVpRYdCsgbJrDRVowOoRz0CpJKN67xBLgcWDLvaNM62y69l0nOZZgdWUHhUfmVvN5cYguotAQAsT/GFAHMaD87B/Hg+LaJj0R8kg/IKhjJv7nD/A1TuSRGEv9De3VGMbnp71/mY2+3x3m67m2QRDsDi9b1y21K7AWOzPjjPAJ5HFcpGhx0aoNRVjX3AOoppTSTfA8i3VDHGfX7zRqm2m2AEygIrRIQXar2JgMYwYG5YQDhCNO/twBG9jNsAOrelwEPXpRTmoaP8S7YKuQRg/PMHlvTs+ki02EuO21jYmCYJSqJadM9j1aiU3iq17paoD2vCAWkFNsIuDYzEm+FMlQTcA83Q4vxi9JW5q4jgqUeGU/lfewO9XoLH/SsMHtTbPpZykPkn70vv/12okbcxW2b+p9JfvwVHSWSbv5vS70h8R/chmctELybPt5Lo3RIOktVve02E1tDUvGNdw+4qiGhrBy6Ng5A2UfpdebiA72cBLRl2qtj6uNnpHDmKD0V4YfDxuv9hbXpoOEhGlsU6iHPUQex6FHReny+ucJP0wRCbC2nxUoq2h43xepItJunIclMjMsWqlJUmITKetVXlJxZFbKHOqblrH+t81ptHAOErFDrJXFoPxMFE/5Knh4Oty+vAa7YA2ECg87vJfPK1/cAVzpbndk2Tk/nipWfjZprc58bK5lGL/r5rr59mlvMnvsjQv7qLjYj4oCdM/ytNlBcT7dMFf8PjGR2ql7Bi07bJP89XVarksPkUYgdXbp5DxKkuL6eLKfXPoplM53GeU5+OSuo+Tl/7X89x5RqxwQtRAvkcW1Ag4K3Jy+AkH0TvxIwcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "802"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:50 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "83"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_2.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_2.json
deleted file mode 100644
index f0ec567495..0000000000
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbY8aNxD+K5U/5EsP9oUAdyudKgIkooLjxO7l2lTRyaxnwTmvvbG9tOTEf+94vSRwTaqqUiKBBJ6ZZ8Yzzzx+IpTtqMyBjZUs+KbW1HIlSfJE8tpYVS4rkMaIMa+2oL1PJkwUk+SP9xek5JKXdTmVdC2AoeFWK6tyJUhCsnkaPcTkglhhTsMXigGaJ9PXo7t5Rg4XZE3zx7pqQUhidQ14yNFdQm6VdtXA0VpQYdCsgbJbDQVowOoRz0CuJKN67xBzgcWDzvaVM62mt/PZeJROM6wm96h4ydRqLjfGoRtLXSzCk1LJjWLrJAhakM7l8GXHbNHaCUP8dDeR/Otjt/XrMNh1JdgkHobR8OLrMdH/iIn/LSb4BWdy7Rr1gtZ2m6pa53BNGc7jhYZK8JymYK+pFdR0wPSKTXSExhYcb5vq3ZcL/2z07vzSXy+gaS9238IEvxgfh3G/E/Y68SCLBklvmPTDd5iEcfOY8k/w5hVJorAb+pN7qrHGIwde383nvz/cj1aL6QRDcJJ6X7nRjOwKjEUy7TgDnD+5Wd5M0WMj1JqKsa8xBVEsqKQbYKm7G+J+psdGq7qauXn2oWB0QIH2ihhYDEPGBjmEfUTjzj4YwsuY9ZFOazroRz16mfcL2rtCu6BrEMYzXXD56H4+kS2yDuO21lamaZiqWdOctlHdXJUBrXjQdD/YxUFTjAm+Vcmx5+a0+cRRXDS8FgX2/EflDfwyBhr7rzT8qtbmcylnqc/Snnr/+FqNpJXZKvtfKv3ie3D65SyTVwv6Qem3iN5IH7nsui1pbWfH3QEaJC0dec+HVdHanMhTxe0zPWvXshGeCnLPpVMGsjMGXjHqUtVlQ230jhzEBqO9ivp4ZL/YW56bFhIRpdvuHNzqIfYiCttdnC1vU5L0whA3EdbmrRJ1Ca1AptnoZjJauR2UuJljVUtLkhA3HdVFpTkVzW7hm6DKqnZb/09BrjQwjrq6g+kzi8F4mKg/5bnh4Oty+vAc7YA2EKjS7vB7XK13cAVzpbndk2To/nipufGzHd2nxL8xSyn236u5fp5tyrv0YTpKs4eoIeYnJWH2TXm6KoB4nzb4Hf78yUdqpewYtG2zz9LVm9Vymf0WeeG3x5DZZO4U1dJNq3DIZZTmhqDuFfdv5PNZ7vw2rHA61EC6xw0oEWyepeTwNwyzW0xMCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "903"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:54 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "96"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_3.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_3.json
deleted file mode 100644
index 723e07b595..0000000000
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW/bNhD+KwM/9Mti68W1nQgIBtd2Aw9+CSyl2ToUAS2eZDYUqZKUNzfwf99RklM7a4dhQAvYgM27e+5499zDJ0LZjsoU2FjJjOeVppYrSaInklbGqmJVgjRGjHm5Bd34JMIEIYn++HBBCi55URVTSTcCGBputbIqVYJEJJnHwUNILogV5jR8oRigeTJ9O7qbJ+RwQTY0fazKFoREGRUG8JSjv4TUKu3KgRdmDZTdashAA5aPgAZSJRnVeweZCqwedLIvnWk9vZ3PxqN4mmA5aYOKt4yt5jI3Dt1Y6mIRnhRK5optIs9rQTqXw9cds0Vrx/fx080D+denbuvXYbDrSrBROPSD4cXXY4L/ERP+W4z3Cw7l2uoKXtHKbmNV6RSuKcOBvNJQCp7SGOw1tYKaDphelgdHaGzB8bax3n258M9G784v/fUC6vZi9y1M8IvxoR/2O36vEw6SYBD1hlHff49JGDePMf8MN29IFPhdvzm5pxprPJLg7d18/vvD/Wi9mE4wBCep96UbzciuwVhk044zwPmT5Wo5RY9cqA0V46bGGES2oJLmwGJ3N8R9pkeuVVXO3Dz7kDE6oEB7WQgshCFjgxT8PqJxZx8M4XXI+kinDR30gx69TPsZ7V2hXdANCNNQXXD56H4+kS2yDuO21pambpiqWN2ctlHdVBUeLblXd9/bhV5djPG+Vcmx5+a0+cRRXNS8Fhn2/Efl9Zpt9DT2X2n4VW3Mcylnqc/Snnr/+FqNpKXZKvtfKv3ie3AC5iyTNwv6Uel3iF5rH7nsui1pbWfH3QEaJC0cec+HVdLKnMhTye2zoLk1dYXVa1kLTwlpw6VTBrIzBl4x6lJVRU1t9A4cRI7RjYw28ch+sbc8NS0kIkq33Sm41UPsReC3uzhb3cYk6vk+biJszDslqgJagYyT0XIyWrsdlLiZY1VJSyIfNx3VRcUpFfVu4aOgirJyW/9PQS41MI66uoOXSm4wHibqT3luODR1OX14iXZAGwhUaXf4Pa7WO7iCudLc7kk0dH8aqVk2sx3dx6R5Y1ZS7L9Xc5t5tinv4ofpKE4egpqYn5WE2Tfl6SoD0vi0we/x509NpFbKjkHbNvssXt+sV6vkt6ARfnsMmUzn02S2vHEvNM1blUM+ozzXJHVPefNOvpznrtmINU6IGoj3uAUFAs6TmBz+BusZGNhRCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "909"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 17:01:43 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "105"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
index 08c8638787..d3c6747096 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-264_backup_snapshots_67e6304e58616125063f24df_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci04NzQgaW4gdGhlIGZsZXggQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfTk9OX0ZMRVhfQ0xVU1RFUl9JTl9GTEVYX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci04NzQiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci0yNjQgaW4gdGhlIGZsZXggQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfTk9OX0ZMRVhfQ0xVU1RFUl9JTl9GTEVYX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci0yNjQiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-264/backup/snapshots/67e6304e58616125063f24df",
   "Headers": {
     "Content-Length": [
       "187"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:55 GMT"
+      "Fri, 28 Mar 2025 05:14:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "49"
+      "37"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 9cb7a5649d..a6cfe6db34 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:49 GMT"
+      "Fri, 28 Mar 2025 05:07:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
index 6bd4e70a44..ed84677b4f 100644
--- a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAACXMsQrCMBCA4Xe52UJ7ienp5thFRAdHuVxOCSYG2tRFfHcDrj8f/wduMcAe3KgW7xY5eHbbwTCJQ+cZNuBXeWo9ctbmcnk9iqTYKWpXdalLE5LKGk5zecegc0OH66XVyPlckk7/vfSWZCTsnQ1mMEpk2O/g+wO6n9CEgQAAAA==",
+  "Body": "H4sIAAAAAAAAACXMsQrCMBRG4Xe5s4WYhOTq5ugiooOjpDd/JZgYaFMX8d0NuB4+zofuKdKenIczykavnJ7EMoKxcDzRhsZVnminUNBdqa9HlZwGaAwNS1u6kFzXeJ7rO0XMHR1u115TKJeacfzvRVkWz1o5G83WgNmEcUffH8/AB0SBAAAA",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "136"
+      "135"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:54 GMT"
+      "Fri, 28 Mar 2025 05:14:53 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "247"
+      "302"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
index 24d99bca3a..492193020f 100644
--- a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPbXxJk7R+8xK3yJBLEbvr1mEoFItOtMqSIckZ0iL/PipKu6ZDgb1sDwEUkTw8InnoJ0LZhsoS2FDJiq9aTS1XkiRPpGyNVfW8AWmMGPJmDdr7FMJEMUm+fT8hNZe8butM0qUAhoZrrawqlSAJKSZ5dB+TE2KFeR0+VQzQPMou05tJQXYnZEnLh7Y5gJDE6hbwkqO7hNIq7djAs7WiwqBZA2XXGirQgOwRz0CpJKN66xBLgeRBF9vGmRbZ9WQ8TPOsQDalR8VH5lZzuTKI7iIQ0MIIfxgQh3HvNOyexv0i6ifdQdIL7zCUcfOQ80e4+kiSKOyE/uaWaizD87MubyaTr/e36WKajTAEyelt47KldgHGYn02nAE+iczmsww9VkItqRh6wjmIakolXQHL11QzxH158UqrthljBUgPKkb7FGi3ioHFMGCsX0LYQzTu7P0BnMWshxVa0n4v6tLzslfR7gXaBV2CML55gssHd3wiaywkxq2tbUwSBKVQLTtlsOnUSq4UW3ZKVQe04QG1gppgEwd7MiZ4j0lwaIB5PpyeD86I65rYt0pU2KX/lTfw8xVorL/S8EktzQuVo9RHaV97/3+uRtLGrJX9G6a/fXdOks4y+jilP5T+jOh7NZPzTkhebEfXnT4aJK3d8B43q6GteaW4hts3EtXQCF7uF0beQOln6fUEsqMJvGDUpWrr/Wijd+QgVhjtF4OPx+kXW8tLc4BERGmsW1FOeog9jcKDFsfz65wk3TBEJcLSfFaireGg+bxIZ6N04TQoUZlD1UpLkhCVTlur8pKKvbZwzam6aZ3q/9wxjQbGcVVsIHtjMRgPI/VTHht2npfbD2/RdmgDgYvHXf6Lp3V3jjBXmtstSQbuj181M9/b9DYnfm3Opdj+q+L6fh5S3uT3WZoX99F+MB+VhPG76+miAuJ9DsF3ePzgI7VSdgjaHrKP88XVYj4vvkQYgeztc8hwkaXFeHblvjnglvJ+NN0nyS/8t13ceB0ssC/UQL7F2a8RZlLkZPcL1JtowBkHAAA=",
+  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPbXxJc5nf3MQrMuRSxG67dRgKxWISrbJkSHKGtMi/j4rSrulQYC/tQwBFJA+PSB76kVC2obIENlByyVeNppYrSZJHUjbGqmpWgzRGDHi9Bu19CmGimCQ/fp6QikteNVUm6UIAQ8OlVlaVSpCEFOM8uovJCbHCvAyfKAZoHmZf0qtxQXYnZEHL+6Y+gJDE6gbwkqO7hNIq7djAk3VJhUGzBsouNSxBA7JHPAOlkozqrUMsBZIHXWxrZ5pnl+PRIM2zAtmUHhUfmVvN5coguotAQAtD/GFAHMad07B9GveLsJOEvSTq32Io4+Y+5w9wcU6SKGyF/uaGaizD07O+XI3H3+9u0vkkG2IIktPb2mVL7RyMxfpsOAN8EpnOphl6rIRaUDHwhHMQywmVdAUsX1PNEPf5xSutmnqEFSAdWDLapUDbyxhYDD3GuiWEHUTjzt7tQTeGfrcXduNledZHxzMWdRjaBV2AML55gst7d3wkaywkxq2trU0SBKVQDTtlsGlVSq4UW7RKVQW05gG1gppgEwd7MiZ4i0lwaIB5OpzG3TPiuib2rRJL7NJH5Q38fAUa6680fFUL80zlKPVR2pfeH8/VSFqbtbL/w/Sv785J0lmG5xP6S+lrRN+rmfRbIXm2HV23umiQtHLDe9ysmjbmheJqbl9JVEMteLlfGHkNpZ+ltycw/AwuVVPtRxu9Iwexwmi/GHw8Tr/YWl6aAyQiSmPdinLSQ+xJFB60OJpd5iRphyEqERbmWommgoPm8yKdDtO506BEZQ5UIy1JQlQ6bazKSyr22sI1p6q6car/d8fUGhjHVbGB7JXFYDwM1W95bNh5Xm4/vEbboQ0ELh53+R5Pa+8cYa40t1uS9Nwfv2qmvrfpTU782pxJsX2v4vp+HlJe5XdZmhd30X4wH5SE0dvDAW3ifQ7Bt3j85CO1UnYA2h6yj/L5xXw2K75FGIHs7VPIYJ6lxWh64b454JbyfjTdJ8kv/Ndd3HgdzLEv1EC+xdmvEGZc5GT3B2KFCoEZBwAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "797"
+      "792"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:49 GMT"
+      "Fri, 28 Mar 2025 05:07:18 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "702"
+      "716"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_1.json
similarity index 65%
rename from test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
rename to test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_1.json
index 4dfb05ddca..89a6c19a13 100644
--- a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_exports_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAH2QS2vEMAyE/4vOCXH8THPr49JjaU8tpWhtmYam6xDLsLDsf68LG0ouPWo0+obRGfxKyBRuGUaQQppWqFbal96OehiNeIUGfMmcvh+QEca39wbotKSV74r/In4M9c460jJqieGA1vQKB2+lPSBs3mdGLhnG83WmcJ/mmTxP6Vhl0QAnxnkvXhqY/uhxR1dCxUpfVorTqXo27Ec+4pI/E+fOUAxoB4kqSgqSXAjWB9LXBdJuQcJ0fq5FaW0Hp7vdK7TreqeVEM7Jmxq7hfxT3vtfX61N1fJUqFCAyw+9CLLUbgEAAA==",
+  "Body": "H4sIAAAAAAAAAFVQy07EMAz8F59bNU+39LbAhSOCEwihkDiiomyqxpFWWu2/E6StoEfPjGc8PoNfyTGFA8MISijbCt2q4VnYUfajES/QgC+Z0/e9Ywfj61sDdFrSyrfFfxE/hLqHPaEWJvQCVfRmIKcN4RBh0z6x45JhPF9nCndpnsnzlI4VFg1wYjfvwUsD0597NHZAiVJZgTqqD43VfVkpTqeq2Wzf89Et+TNx7izF4HBQrqopKOpDQB/IXAlHO4KE7fxci9LaKjTd7hUSO9kbLfWNQFFjt5D/5Wl3ngm/5XOtTVXyWKhQgMsPTsxpEm4BAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/exports",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "238"
+      "245"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:48:49 GMT"
+      "Fri, 28 Mar 2025 05:17:40 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "373"
+      "328"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_1.json
index 3abe3fde82..3cb9f985ff 100644
--- a/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-264_backup_snapshots_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsXICIRT8F+o7OVEhXpdMmjQpolUyKRAeJ+MdEOCcXBz/Pc/RM2OT0g52l7f7ZjkQ5cPwBo31LpH647MgGpKKNmRESE0ypFwmJ0Pa+kwKAt/BRkiPGTlWsUVZzUom1lNez3k9q95RYiJ89eDUsB4CoMw7DZ10Gimr8c4FzJnhfCnEhgnBjZDiYboUyLfW7U4xDmQbwaB2m3NINaWq9b0uNewnnXeN15uJ8h2VwVKZW5nontEm+j4kugCjJZcgZ4aBZiC05gqqBY7oU4aYxkO5nNKNVLs+0HG/RP/JFqHFQAlaQ47FnQJebW9sbiwuYnLE6oJvrRpeMnSXLiMEROQK8qvsTl3cjB7Xvvb0PPaUssw9ziBYZA9nxEfZwMr+wNOAn4LUVUHy+eGfCzn+AkUe3nBRAgAA",
+  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOnVjF7KBWFgYaCcQg2u/pFYT2/ijIlT977yqTVEXRjb73fnuns4HopwfX6EzzkbSvH8URENUwfiEE9KQBDGV0Uofty6RgsCXNwHiQ0KMVYyX1aJk9+uKN/O64fUbUtoAnxmsGtejB6Q5q2GQViNkNN7FEsSiqoHfibmYM16JRctq3SLeG7s7xTiQbYAWuduUfGwoVb3LutSwnw3Odk5vZsoNVHpDZeplpHtGu+Cyj5RDq6WQIFEUNIOl1kJBxVEixwQhToeSiZpupNplT6cFI/0jXIAeE0XoW3Is/ivh1ffG58bjwiZHLM+73qjxOcFwaTOAx4lcQXqRw6mNW+1p8WtVT1NVMcmUUYRglxnOExdkByvzDY8j/gvSVAVJ54e/NuT4A6q6sHNUAgAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-264/backup/snapshots",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:30 GMT"
+      "Fri, 28 Mar 2025 05:14:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/memory.json b/test/e2e/.snapshots/TestExportJobs/memory.json
index 27cf9bfe22..cda049a62f 100644
--- a/test/e2e/.snapshots/TestExportJobs/memory.json
+++ b/test/e2e/.snapshots/TestExportJobs/memory.json
@@ -1 +1 @@
-{"clusterName":"cluster-874"}
\ No newline at end of file
+{"clusterName":"cluster-264"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json b/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-129_1.json
similarity index 79%
rename from test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
rename to test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-129_1.json
index ade89c9df3..68a8b76c9e 100644
--- a/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-129_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci0yOTUgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTI5NSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci0xMjkgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTEyOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-295",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-129",
   "Headers": {
     "Content-Length": [
       "189"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:15 GMT"
+      "Fri, 28 Mar 2025 05:09:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "76"
+      "62"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json b/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
rename to test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_1.json
index 93008a32cb..92632d6d93 100644
--- a/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-129",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:15 GMT"
+      "Fri, 28 Mar 2025 05:09:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "280"
+      "289"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-129_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-129_1.json
index b740f3ac77..75ce83f654 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-129_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci0yOTUgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTI5NSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci0xMjkgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTEyOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-295",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-129",
   "Headers": {
     "Content-Length": [
       "189"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:45 GMT"
+      "Fri, 28 Mar 2025 05:07:25 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "92"
+      "58"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_1.json
index d7c5497eca..fd37718f15 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_1.json
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:07 GMT"
+      "Fri, 28 Mar 2025 05:07:48 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "66"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_2.json
index 937d93f981..298d6ed63c 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_2.json
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:39:12 GMT"
+      "Fri, 28 Mar 2025 05:08:54 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "87"
+      "74"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_1.json
index b86cb6aced..055bc9f1d7 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3lWqbFNtG9VeyKIiOl9cMchsdmWYpuWJBU8uf9+G+xx9xBYMjM7O3MnZ5lf+k6Ac5UuLYnvBLQ816BI7EwP3yOS1711YLJbByQmx/Sw264SkWYEoVZryF3VauHMoPcKA9LBGh8KaECjcTAbU5ZNWTzjcRi+o7Q0bd9t0YVEUCjJJMhZQUFR4EqxHIIISZXHGYeQqmi+4PxMOWcFlzxU8xzxptVlu16+gLF4A3Lnk2DCENCy8d7D6WO68Ns6014rBeZ/WB8f58MA7R+65FUgX1X2Iqov2CxJHE2CvwUD62mXviHNQInmw9+zOKWJyE5Tgj1YhxUMwOqYJtl2v0GBk9774xMnME2lpS8QL3CPKtPf/gtZWxiR6yPdEWqQFsQNEzW4cJcJ8v0DsrkcHcABAAA=",
+  "Body": "H4sIAAAAAAAAAE1QXWvCMBT9L3lWSdMldn2r2okgIqb7YGNIbG5LsE1LmgpO9t93ix3bQ+CSc84995wbOan83LcSvDe27Eh8I2DVqQJNYu96+J6QvOo7Dy67tkBickj3280ykWlGEGqshdybxkrvRv2gcKA8rPChgFHGpzScsiijPKbzmD28o7R0Td9u0IVwKLQSClRYMNAM5lqLHChHkhlwMQfBIMp5JAIRME5FWAQ0pIjXjS2b1eIFXIc3IDea0ZlAwKp68B5PnwbsET9b11yMBvc/7BAf5/0I7e665FUiX5vuLM0XrBck5jP6t2BkPW3TN6Q5KNF8/HuWxzSR2TEg2EPnsYIRWB7SJNvs1ijwavD++MQJXG2sGgrEC/y9yvS3/0JVHUzI5Z7uABWoDuQVE9W4cJtJ8v0DQTBwgMABAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-129",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:45 GMT"
+      "Fri, 28 Mar 2025 05:07:25 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "77"
+      "56"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_2.json
similarity index 56%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_2.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_2.json
index bc1c4b59b0..9335070c89 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAJ1SXWvbMBT9L3roy2JHUWwrNYSRLt4IhFEq74ONUa6t68TUkY0kG7rS/77rxaF92PYwkEDonHuPztF9YgWUD32n0PvaHBxLnxgaKBrULPW2x+cZK5veebT5Y4csZXfZ7X73bqOynBHUGoOlr1ujvL3UOw9Gg6UG7NSaQ6uLdD6HMsDqyGVfBO5IYMA5rbAuFnVkeTgRA41DaNCnQvKFnP2xaPE/ReLfRfO3zjXr0e8V9P6o2t6WuAZ9qs2Vxa6pS6CE1uAbcIGHxNry0pxSuBhWdnjx/MbZgXxP4QXiOv7bE9iYsUXwuKVNHQQXccCXgUjyRZIuZRpF30jmYNu+242xxlhpSABhWQnUAqXWSYk8JlI94onESOh4dS1lIaRMKgky0quS8N/a25vPaB39GnFXIQ8TAgycRu1X76XLzrZDrdG+Ho9xYOh8O0Efz3WbL4r4unYPqv6JH25YGof8pcHEer/PvhLN4oHEp7tP6j7bqPx+MeZAUXqcgN12nxHZw6j7/Qed0NKHwDhupO7Pg5ddprWCxuGMDWdnd9ggOFSP5OZEzfa5Ys+/AERfdfTuAgAA",
+  "Body": "H4sIAAAAAAAAAJ1SXWvbMBT9L3roy2JHVmI7NYSRLt4IhFEq74ONURTpxtXiyJ4ke3Sl/31XjUP7sO1hYIPQOfeee47uA9kJeeg7Dt5rUztSPBAwYteAIoW3PTxOiGx658FW9x2QgtyU19vNmxUvK4JQawxIr1vDvT3XOy+MEhYbkGNr6lbtiulUyKhmtab+e+TuEIwoxS+WP6H+MT/EIzFSMMQGfMFymuSTPxYl/1PE/l00fe1cswx+L0Tv73jbWwlLoY7aXFjoGi0FJrQUvhEuUjrr6vm5OaZwNszt8Oz5lbMD+h7DixJ2+bcRSMjYgvCwxh87MMrSiM4itqhoWtC8YPMvKFPbtu82IdYU9kpkAsRsz0AxyJXKJNAUSTrgWQ4Zg4VMF1mSJSyl2Wyf0FmY9Ul7ffURrMNXQ+4ipnGGgBHHoP1iXrzsbDtoBfbleoSFwfP1CL0/1a0+ceQr7Q5c/4J3V6RIY/rcYGS93ZafkWahRvHx7gO/LVe8uk1CDhilhxHYrLclkr0Iul+/4QksPogI64bq/rR45Xlb96JxMCHDydkNNCAc8Ht0c8Rm24qTx98Es1Kk7gIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-129",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "444"
+      "445"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:06 GMT"
+      "Fri, 28 Mar 2025 05:07:46 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_3.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_3.json
similarity index 55%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_3.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_3.json
index 81c1013cd3..e3a70868ec 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_3.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAJ1SYWvbMBD9L/rQL4sd2bGt1BBGunglEEqpvHZsjHK2zompIxtJNnSl/33nxaH9sO3DwAah997dvad7YQWUT30n0bla7y1LXxhqKBpULHWmx9cZK5veOjT5c4csZXfZ7W77aS2znBHUao2lq1stnTnrrQOtwFABdmz1vlVFOp9D6WF14KIvPHsg0OOcPr8ugjoy3J+InsLB1+jSUPBAzP4oCv5HFP5bNP9obbMa/V5A7w6y7U2JK1DHWl8Y7Jq6BEpoBa4B6zlIjCnPxSmFs2FphjfPH6wZyPcUnhdexn8bgY0ZGwSHG/qpQsjD2OMLL0zyIEkXIo2ib9Rmb9q+246xxlgpSABhUYWoQhRKJSXymEj1iCcCo1DFy0shilCIpBIgIrUsCf/de3N1j8bSqxF36XM/IUDDcez9bl667Ew71ArN+/UYF4bOtxN0c9KtHyTxVW2fZP0Tr69YGvv8rcDE+rzLvhLN4J6aT3df5GO2lvljMOZAUTqcgE22y/LtzTUJHIy9v/+gExp6FBhXjiZwp+XLzhtbQWNxxoaTuztsECzKZ3J0pIK7XLLXX/xuHXjyAgAA",
+  "Body": "H4sIAAAAAAAAAJ1SXWvbMBT9L3roy2JHVmI7M4SRLl4JhFIq74ONURTpxtXiyJ4ke3Sl/31Xi0P7sO1hYIPQOefee47uI9kJeeg7Dt5rUztSPBIwYteAIoW3PTxNiGx658FWDx2QgtyWN9vN2xUvK4JQawxIr1vDvT3rnRdGCYsFyLE1dat2xXQqZFSzWlP/LXL3CEaU4hfLH1B/nx/ikRgpGGIDvmA5TfLJH0XJ/4jYv0XTN841y+D3QvT+nre9lbAU6qjNhYWu0VJgQkvhG+EipbOunp+LYwpnw9wOz55fOTug7zG8KGGv/zYCCRlbEB7W+GMFRlka0VnEFhVNC5oXbP4Z29S27btNiDWFvRKZADHbM1AMcqUyCTRFkg54lkPGYCHTRZZkCUtpNtsndBZm/d17ffkBrMNXQ+4ipnGGgBHH0PvFvHjZ2XbQCuzL9QgLg+ebEbo+6VYfOfKVdgeuf8LVJSnSmD4XGFnvtuUnpFmosfl4957flSte3SUhB4zSwwisy21Zba6vUOBF6P3lK57A4qOIsHI4gT8tX3ne2L1oHEzIcHJ3Cw0IB/wBHR2x4Lbi5OkXlPxf8vICAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-129",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "447"
+      "449"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:16 GMT"
+      "Fri, 28 Mar 2025 05:10:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "88"
+      "67"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_4.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_4.json
similarity index 79%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_4.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_4.json
index bbd15a7511..670edaff28 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_4.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-129_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItMjk1IGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItMjk1IiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItMTI5IGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItMTI5IiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-129",
   "Headers": {
     "Content-Length": [
       "204"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:49 GMT"
+      "Fri, 28 Mar 2025 05:10:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "56"
+      "33"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
index e211ec17a1..d2fe47ce26 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAO2d3W8kt5HA/5d9yFMmIotV/BjAyIO9OfhwtzGSzcsd8sBP7yZaaSGNDBuB//cUp6dnuttri/LCzUYkY2HIq/I0q39DsqpYVfzXq+v3N/+8f7X//3+9eneXy6v9q3eHw8f7/dVVvL59SLuUv/vDh9ubb29T+EO8/XDlP76/8odrf3/1HVx9e3f78PH+inJJXvvsVYGcIJuUdMyCrsp1/v7L64f7Q767v0q3b24PX+XrfMh/u8/pT7d3r+H123x/uAo+/vPh49Ud/3x7l//7Ntz/8f1NvH5I+cvbh5vDF4e7h/y7j/7b/Obhwxfyd+8P+cP9N/nuG/6bL6QQr37/6i5f88jv83V59ePvt67Jcvxn1eCsyU3+/vDqx7/X/7x/uD4MfFK+fv9dvvvh7Q8fM8v85fVf3/75L6/5/8nff3x/5w/vb2++8of6KxBAO6F2oN8C7JXdI/0fy71P/DttMkJy5FPwmqTyNmqhrK+/v7k/+JuY3/gP9VN+Vk0W/Xh3+48cD1/XT/y5l3bU5vgi/hrf5fRwndNPxyf1ZXz3N/7j/bvbw5/e37y/f/cTaWnfSrMXek96Kv31oFVynjWj7ERC4VCrJOj43WCdDg/39YX97c2br9/8F//Vwd99m1m1j9e3P3zIN4evmchJ6ThA3pGinXISrIwUSsJiUaYirROB/2VNEZBQFY1a0/kTv2l5K/UL+hkohV2gNGKCkkr24rdE+TNsTiTdaXit3Afp35j7l3/+32/+5/Xb11+1kQe3GlC5V7RHnAGVOYkiixNFlSxdBIbaCSjtld4jNAKlizLbAqq0XhEo7lEugDo5BSpDCP2A0ml4bUBHZZ4tUMHf6D3qOVBImUyKHshh0sWqGDsB5bGNc64BKF6U2RZQcLAiULVHsQDqos6JcoCQ+SfSzvYDiqfhtQEdlXmuQFkrWu6hKgdWw7oCaBLJHHRI2Amo5DfePkPlRZltAUWpVgSKJ6tjApTNbZeyLtrr4KKF0msPHRCpdqCjMs8VqDB7dHuaGUWKEhtDQTkjEYQT7GcV3QeoYERiT41WLkufldkWUEK7IlB22c0caCxzoEqYbkAZEbp2oKMyzxgo4HIPJUNxAlQ4jbIbUOAltzGwUKVxk3uodCsuuaDYeV8AlXYK1KaS+gHFvWqfoWdlni1QtRe0BzcDKr1zaLTy2chkQxRFdgn9UY178EtXTW7LID0qsy2gxq625DJQ3AMsgJIOOStWJQdHlKV2/YAyoiYrd5AelXm2QI+xXDWfoYJscMVk6ygYKaMO2MUoorfSHWO5jTO0So/KbAsoOrkiUFxEihgoiSlQigj9gNZwbjtQ3GSkaC2gVI/PWLHBcx+BQjJgDBtGToMXXgsIWXUCqvfSNgYWBulRmceAmiPQ+udTQC1pnbIqjFGCK4q/3MdX8KtDf+BWBKoXMxSSznYG1EGvGXpE1GblDtK6cYb+xwIVezKLwAJE1EGi4IVHIxRQRZsufijVcDuNqQoNQPGizLaAIuKKQPUisMBAIU6BZhO6hP7OiFqXXLwo81yBsh1xXHVnQH0W1jvBKgmTClkqvtceqmqoQDadtgzSozLbAgoruS0DULnIKQKfIvKnsm2khKLMP8pee+iAqHXJVRdlni1Quxfi5LmfgTqfWCdLgFoUY7RBnzsBhT07VtI0AoWLMtsCyublLoLwWWWeINZg0dXbJ0oyZgtFZvIoVIi2iLXImz3xbBYL8s7OyEOfbLKRpWyK4tPx4HRU5oX84+TRLIKJ4Ez0U/KkU5ekliNLtO1zXl6U2RZ5tG5ngo0ZATImx55lUaoEAehdFvzpXoqirCTMK5Jnx9EtyNsgY1DCo+WvafWfSj/y5ilz/qzMC/nHyUs6vdoLeYF6Sh5K6nSAwCyP8Y9m8mdltkWe3FrBjwoUT6buBKgwijzZBBEUf70odElkOyPS7UBHZZ4tUF1NXTHflU1O2XrQzplA1RAH0SuaJerwqHVtFhdltgVUW9pZR6CCltrV04hkS0QjStaovNTFEfL8MX6lfJqBvFg61SZ7m4SKWistPdgsXa+1eWDZehYoLsq8kH+MPNWI4sIeM6mU6ZyH4LrUC9Bb4WoEuzWcUqXNJu0xzY+MYG1RXkcswG+W3Z2QlDeJd8hQH8lvqUiVzIrk9R7kgnykGXleBfqRN832WJUelXkh30Ce9mI55/mDJ6t9yL5T5sfAsq0sc5AeldkYebVTqHJBadko1pS9FqUUGQEJJRtS0Rng96OP1XVrgce90AvwambgSZE6LvZ0Gl4b+FGZF/CPg4c9LMDH5KfghTOdsjErSrWHJ+zyozLbAo8GeICSnFLGJkfSJZSodDACIwXrhcHsEkkb/Yrk5dJJN9GpGXmlO8XbTiybalkGablJJ32b5MGeyoQu5A07GBfybJHkTuEZZgmMs9Gnq9KjMtsiz2v6DhMir+/otPDGFOGkAxRKIVilrWR3DshKtU6F6UDenOqJJuTl1LLXIWM/y76yfAL5UZkX8g3kca/m+WhsgczI+6h/0945v0ye9qp9tT8rszHyVu+EFA5zsSZIlSkxdFTO1Mp8qTQp/p0AQbROvc1AXu0VLshLPSNvsONqj6eSqDbyozIv5B8jr+qRpZrv81QcTrx5k5XtZdsfa29VY8qiMBdltkXemLXS/itQzVvkAijRFGjKvlOG2wlR6/ZtLso8V6C8nCm1rOMAlCaC4j/G1pOAkGWveJs6ltq0rs3qosy2gLLTtSJQWJpZoBLNgDrZy8w6Imqt46jSsEkza0Wgdl9fwzwTUeQCnk0ntt+trS58sZ3S/gXUctVmuxkuymwLqHFrJRhWoLBMKhbZlxnQ2Ku4dUAErUcccFHm2QKtEd9FbooM/JSYnGJP3Ef2spXNXTIUsNYNAb/0pkaFg7TeZG4K4GpGEVSPkOwCqJsDldTFbTkjarJyB+lRmecJFOqSC3Ivp/kEKcvsjDaBahu0gDaioC5t0OD4fYO9bNpDB+lRmceA4lh+Tp8CilpmsNLVkZvkFe89Sn4GUJTrBBMHoIuksAqUrFeQEiobnXSYoMtp8YioLU1gkG5NCvuPBWpqMhWYOVCHajJDQybdZcmFY18719jCZZAeldkWUEXrJO8NQGsntAVQgZMZanOMHYHa0/DagI7KPE+g8i2o4xubWrkpeZ6UmlIANgq8kClm7LLkylPBXlt1zCBtG+ui1gVq14krDDyXE5R5Wpzx9H0m6JlQk9cySG9zgq7Hky3I2jpsxtMWZy0pY0hLnbXIhbp4ofLYkkWe2iA18NQXZR7jqU48lf0UTyUFSUsUCoDLHoSV2nxOWIGfao0Mkd+AdUKzX5/Rl0joSSWALNlX1L46F2lF8mIef6jkyc/IB9trZR5YNtlOg7RojD88e/K14YSYByr4M03wSkfpCJ23WWjRbU8+tpCgJiNrkBaNgYqVyRu3MzoJV3IOwlESoThlqFgJQQuQIcicUipqpc4UI3khFuStmJLnx3bpHXNm2braq4syL+QfI2/3Ss5rY1Iihh5z9p4MxCKBfJ/SVlk7Uyhot8Phosy2yLMduEXyYl4Px+RDCgpJBmWKyBRJ9jk4Glk+hbxorId7IV9DFfMaCSbvjZ+S5yF2OQM+sgQ6Da+J/FmZbZHXdourPTvqCy+dvIoz8jJ2Sbg6s2y17eGizAv5x8mzkScX+7xTZUpepo6r/fnQoon8WZltkXfW7GolsTCecr2ALtQb6GqRqVFWgMo6Z/K5ZBPXyZodyNvTceCEvMAZeQ/9LDzZejXpID0q80L+cfK1PQTNyWMkyikgClVkHVbpkrwnT/0G2zJJ5KlHnWiqiFvZwnN6RxKkBcQEgTIJV7Pioxey2AzFJUB+iGX6a5E/Hl+IhYWH1tddyJAkL7OP3nfpb3Nm2brPy4syL+R/kbw4XqJpF5GcCN4LFcnarF0MZIyCLtcLieO1mLaxs9Eo3RbJgZH8J5ONZMixZCFS9jKaFPif9FmdJnFjXt1AXu/JLMhrOSWvs+hyAjewNKfhtZEflXkh/0vkpTtePj827h3J+yKJmLoxBdga4cU+U4/usjy8ep18Y6Pok/SozGPk5Zhg+MnVXujExk10mFDWkxZdzLGt16++UkzxQzEJCjGjzc47tLW3rHA5V5uqoC5sAPKivyZ4ceqpPgFfT+h42mttE+nAD+kInlG2bPMn6VGZF/C/BN4eb/UyizNaZ6PUwVihJfEyl9Bb0aPuvV5SRHV41FKWc5ZuO6MV41qvPgE+FhliBIyohA4lMxVxDGX96vMaJXYYlY68g+QYHfEHsj+Xarkx6GgEP5FnV0x5nbypE3m9sO+cDclKEoV3thLYn/f81exJvimZ/CStG+27Z09euj2KeX+b5IxhX0YLKYOUqXYXztQjdluHp/Yo27LOT9Kisb/NuuQRcYfWGHbmMtt0yZpiaku7oLS1QWN0SqrEb1utU7M3kFduEcFj8rzSO0jaABEgKSF7rfYDy9Y5ry7KvJB/jHz1gZb7PNXMoFLIalOyo2Bll/vZ6/COl4I17/Piosy2yGtg8qEU463yCVCBN2SC57dRr9auGeaacigK0ioVDCfyP9nnSaKwNbJcjLD8LYgkekTtTyx1WxznLL3FfX6b5FEuovbsykQ5nfPSYo8I3sAS5VPm/FmZbZF3uOMPIQu+8LsURZhC0RnF3JOJ3jry1nqgEFYp/D2BF6diyQl4a6ZTnk3OLt78GWWTNz9Ii0Xl5wv4nwWvFlcxMvgY4hQ8pC4Z1wNK1XgV40m69SrGdcErZXchOkslo04iePboqAh+zwl0wSyr2xwt+3Z5NZ9O15uiSSzIWz0jL2O/XV49aZc/K7Mt8pJ3ee3RFlCCgM16HZQCIZHXAbQ+ANtRVgjhclilhvxMXqkFeUMz8kJ3JY8tZ/Nn8qqpbcfLnNe1CRXJBXkME/vOR9+lc+WZZVOPrJP0qMy2yG9zzoNbevPoc57M+ZSM6jfna5/ilhPas/QWvXl223Zkosg6eZdJFClrUoaJkj1oJ9EpDWxIa2txlXsoTuTNXi3mvHdqSr4e1vcjb5/i052VeSHfRF4u9nlvp968N973s+2Z/BNs+7My2yJvQfMjrWI3DoOnXE9l62kYTykrfD0LjQJcVm6wqNYjv3TnvZnt88aErnNetVRTnslv0Z03IHa2usouHRNygOe6stlKoBq1l8YRxKhAC7OihQd1q1+QJ5qS10n1yMQ6s8Qn7POjMtsiz+v5LtTqVEtS5eiSrm9EFLbsdNDa5lAET/8Axq9SQX0iPxrPE/Lgp/u8d6ZHHe1l/W736s7KbIv8Rld7flliSR5nc56gX/AWxrO3ZvIbjORsdLVf3PZcyYuZV+dl6Uhet1VTnsm33fb8strrYwHigrzz0zPa5ETsUVN3YoltTclO0qqxff3Kc97YXQSCgmQQszQGM1IiKQoJ1Ek7XvcdgA3HiuW1yMO8i3Ylr/V0tVc596ivubB8goUHjV20X8jrYyuSRQzPidk+rwT1ysUSxx45T7DwRONdYytbeMj7PIJlD5lXd5el8FYSemTgKloLPoAMEkCrVW6ZG8jXFMxFJMeGMl3t+TvZo+vvhWU7+bMy2yJP4HYYdJZZRIzksvGREEvNf4kJnHaWrPe866u4KvnlWR0vOtM5DxL6ndhU8q35l+KizLbIb3TO2/n1J5W8SbM5j6JXzvUwi59A3jZef/LM5zweS6vMItseKagQNJv3QEWTsyL5HrfJ1p6jtcS5Med6kDZt2fZCj/1MP1VNyW4XZTRKOB65Sy5EjzJ9BnntzI7xahdJSyL26c1g5DmddVZZU6AS0UGmdby6gbxeZNsj+RL5SREyloIp2RC62PZnlk37PJ5Sy5qy7V/I8y5aew3M/HlUPAITiiCWi9kGSa5L5i3WmmgJe2o6qxukZVv/y5XJ19tknVNS83zCCKkoY3PkXZ0MgdA2Jxtdxhj1quTHBpMX8rYIjLzlZKWLzqH2zOhHXp46TLeRH5V5NuT/zuK3B3/95e3DzeEVL3rw478BroUBkUDBAAA=",
+  "Body": "H4sIAAAAAAAAAO2dW49cN46A/4sf5mlqTEqkLgUE+5B4gCx2M8GM92UW86Br4p12t9FdHSQY5L8vVaeuJ3ZaToCjg+kOgqDjpusc6itJJEVS/3p18+72nw+vtv/7r1ff35f6avvq+93uw8P29et0c/eYN7n88Kf3d7ff3eX4p3T3/nX48O512N2Eh9c/qNff3d89fnh4zaXmYEIJuqqSVbE5m1SAX9eb8uOXN48Pu3L/8DrffXO3+6rclF35n4eS/3x3/0a9eVsedq9jSP98/PD6Xn6+uy//eRcf/uPdbbp5zOXLu8fb3Re7+8fyhw/hu/LN4/sv8A/vduX9w7fl/lv5ky8Q4NUfX92XG3nzh3JTX/38x7VrMn//k2rqpMlt+XH36ud/tP99eLzZTXxyuXn3Q7n/6e1PH4rI/PXN397+5a9v5O+UHz+8uw+7d3e3X4Vd+5UCxRvQG+XeIm7Bbsn/XeTeZfmdscWoEpidQYOKweiKylP7/e3DLtym8k143z7lk2qK6If7u/8rafd1+8RPDdpem/1A/Pnd7buH70v+5esBb8FtWf39LPy3JJKPN5+SPirzcBs+PHx/t/vUZ8NbtE1a2Uvpr6chyIkiILJPORnrc2L0bJrcLuweZbhfffmX//72v968ffOV/OEu3H9XZCQ+3Nz99L7c7r4WgIcxStN3YiMjeBL8tmds2tf0twGFreIt22uglNmCUTWRk2cRO6yDgNJWmS37TqB0VmZdQIkX5ElbxhlPry8maPGKBvIUQtTP86jMs+Rp3iq9VWq24JK2xdsSdWKtAchgtn4ET9PGXN6QTA/PSVr1LbjojzzNx3iG6p3KOhqDFjKVbJTD38GTCTZs0DvAanOhTJCSgsDGuBqSUr5Skc21WgMLksfD0F6QD+GKPJc0jrywdP3kj8q8kH+KvNqyOyxkZ/JK65BjMIw6uGSoWDeIfNuQZdp3kjdnZZ4i7/bk5S98lLyXbz5x8UIdPBmdgffW+m8lrz1sTAgZQsEQoLIuJWnno8kpyXPIIuQI5JwrC5KXLz5fk8fK3tqorDXVBuuLHrJ7n1h27d6T9FGZF/JPk9f+4LmcyKuc3SV5w9YMI09w2Lm7yJ+UWRd51iz0UbaMxLFmqo4wV3QeovzH2Qoqk66GjFnMwtuTxzn5CJerPVg3xKU+ksf+OX9SZl3klV8SqNsSz4B6vgKqXRgGVBB1G27mrMy6gK50KrstuBl5ezmVuZYAI8nDZ5GfpNdFfsGpjFvNW6IroFgyVKweqq4FfVICdRBQ3mpZnrvCnZP0UZl1AdXGLAiUtoQzoB4vgWKMcRxQPrxeH9CjMs8WqFilNI+SoMqFbU5BsadsqtNpVJRE3u045zqA0lmZdQFVXi0IVIvJOQPqkymZS1SxyE9s/Kjgx4QI+oEelXmuQEUrnu+hukRRw/mqyGbGEk3Mo/wblBHvn6F4VmZdQAn1gkDpYHVcABVz2+diqgkm+uRUHbWHToh6w5N4Vua5At0fgs/ODDVnMYai9hZJgQfxs+qg2BMIIug81N9Ln5RZF1AmtyBQcdrtNdBUr4FqsMOACqLeYGKTPirzjIEqmu+hbDldAAVvCIcBVdwdUmrStMo9FP2CS67S4rzPgKK7BOpyzeOA0lb3z9CTMs8WqN4Cb9VVnobG4D1Zo0OxmF1MUHFI6I9b3EMGXXe5LZP0UZl1AbVusSVXgNJWqRlQNrEULaqU6JkLmiGJNydEXVbuJH1U5tkC3cdy9fUMBXbRV1uc52gRk4k0xCjit+j3sdzOGdqkj8qsCyh5XBAozSJFApThEignUuOAtnBuP1BaZaRoKaDcjs9EsclzPwJV2SprxTDyRgUIBlQsehBQs0XXGViYpI/KPAXUHjLe4KO5q46NyUVXwYjKVy1f7v0Q/ObQ30LJ5RNQM5uhKpviroB6NWqG7hH1WbmTtOmcof+2QKGldF0HFlQiE5FAFh5DqipdjR3ih3ILt/MxWaEDKJ2VWRdQIloQqJkFFgSoSpdAi41DQn8nRL1LLp2Vea5AxY7Yr7pXQEMBFzyISmBzZcc1jNpDdQsV9GWTTdJHZdYFVC3ktkxAcZZTpEJOJJ8qtpEGzUV+xFF76ISod8nVZ2WeLVC3BTh47iegPmTRybEiA9VaYymUQUDVVhwrtJ1A1VmZdQEV83LT6jiKLjJBnKVqmrfPnDEVpyoWDgQ6JleXqevg/cGpzGaYkffuirwak012ZIldUXzeH5welXkh/zR5srNgovI2hUvybPKQpJY9S3L9cx7PyqyLPDm/sdGlQkoVyl48y6p1jaAo+ALy6QGhaodMy9R1TOTFcfQz8i5iihoCOfmaNv9pSEXPkeVnzPmTMi/knyaPfBjaM/lWs3lBXtU86ABBWO7jH93kT8qsizz7pYIfDSgdTN0LoGA1B3ZZJaXl68VxSCLbCVFXKfYkfVTm2QI1zdSF613ZllxcUMZ7G7kZ4gpGRbOgvR73rs1wVmZdQI3jjfOsdDRofDuNyK4mslCLIR3QVM8k88eGhfJpJvIwd6ptCS6DTsZog0G5gn7U2jyx7D0LhLMyL+SfIt/6w8ztMZtrvZzzKvoh9QL8FnyLYPeGU5q0XaU9ZuSRSTlXdTCJqpKRFXcnZh1slh0ytkfKKFXU2S5I3mwVzsgnviIvq8A48rbbHmvSR2VeyHeQ5y3M57x88MVqH0sYlPkxsewry5ykj8qsjLzeaNKlEjoxig2XYKDWikkRE4ohlbxVMj5mX123FHjagpmB11cGHkIeuNjz4fX6wB+VeQH/NHh1aCB0Bp9yuAQP3g7Kxmwo9aEzSh94NeuGtA7wZJW8ILLX2rrsGX0mJG2iBUocXQBLxWdGl8KC5HHupNvk9RV5bQbF2w4su2pZJmlcpZO+TvLKzTroKGvFwTiTF4ukDArPCEslODt9uibtOjvoLHxQSryhTCTrO3kDwdoKHr0i0JqU08ahuHOKHeplKkwn8vOmtEIeLy17EwuNs+wby88g39mU9oV8I09bfZ2PJhbIFfmQzJBWOxNL3ur+1f6kzMrIO7MBBE+lOhtRF84CnbS3rTIftWEtvwMFzMvU20zk9VbTjDyaK/KWBq72dCiJ6iN/VOaF/FPkdTuy1Nf7PFdPF968LdqNsu33tbe6M2UR7FmZdZG3dqm0/wbUyBY5A8p8CTSXMCjD7YCod/u2Z2WeK1BZzrSe13EoQpuUln+taycBseCoeJvel9r0rs36rMy6gIrTtSBQNTezlM58BdTjKDNrj6i3jqNJq1WaWQsCdds2DNeZiFCqCmI6if3uXHPhqxuU9g+qlat2283qrMy6gFq/VIJhA6rmScVQQr0CmkYVt06IVO8Rhzor82yBtojvLDcFozwlZa/FEw9JvGztypAMBWp1Q0oGvatR4SRtVpmbomgxo0jt7zJxM6D+GijyELflhKjLyp2kj8o8T6CqLbkKt3iZT5ALFm+NjdzaoEVyiYCHtEFT+++bOnTifgroJH1U5imgdCw/548BJYNFOfTtzW0OWvYe/Xvu5yBcJpg4AZ0lhTWg7IJWOZN2yaOnrIacFh8R9aUJTNK9SWH/tkDtL+5REaCe9MUMjYXNkCVX7fva9d6jMkn33qOyLFDNyyTvTUDt4f6RC6BAFzPUlZQGAu29HmWSPirzPIFiu+OqjdillZtzkElpOEclRkEAzKnQkCUXDwV7fdUxk7TrrItaFqhbJq4w8ZxPUOHp6IpnGDNBT4S6vJZJep0TdDmeYkG21mFXPF31zrG2lg2aYqBUHuKF4r4lCx7aIHXwNGdlnuKpDzy1+xhPjcDomGNVypegwKGxvyesIE91FmOSEXAejPj1hUJNTIF1Vqqg+IomNOciL0geruMPjTyHK/LRjVqZJ5ZdttMkDZ3xh2dPvjWcgOtAhXymjUGbhJ7JB1fAwLA9ed9Cou8G2UkaOgMVC5O3fmNNBl9LieA5Q6xeW64OVTSgMEYsOeeqF+pMcSQPMCPv4JK8PHZI75gTy97VXp+VeSH/FHm31XhdG5MzC/RUSghsVaqoOIwpbcXWmUKrfjtcnZVZF3mxA9dIHq7r4YR8zFETY9S2QuHEOObg6Mjyc8hDZz3cC/kWqriukRDywYZL8vKKQ86A9ywVH16vi/xJmXWRN26Nq327XJxm5HW6Io9pSMLViWWvba/OyryQf5q8GHk42+e9rpfkMQ9c7U+HFl3kT8qsi7x3dtMqicEGLu0CuthuoGtFplY7ULqYUjiUWmxaJmt2Iu+ubxlu5IGuyAc1zsLD3qtJJ2nXecvwC/l9v0Hga/KUmEuORKArtteqQ5L38NBvsC+TBA896qCrIm5hC8+bDaNCp4iyilwYfMuKTwGwuqKqz4rkIU7oL0V+f3wBMwuPXGi7kGXkgCWkEIb0tzmx7N3n8azMC/lfJQ/7SzTdLJKTVAigEztXjE+RrdVqyPVCsL8W03V2NjpK90Vy1JH8R5ONMJZUC0AuAZPNUf7Jv6vTJK3Mq5vImy3bGXmDl+RNgSEncBNLe3i9PvJHZV7I/xp59PvL54+Ne4/kQ0VmoW5tVWKNyGJfeER3WXm9dp18Z6Pog/RRmafI4zHB8KOrPZgsxk3ylAnbSYupdt/W6zdfKabloZSBYyrkig+eXOstC76UZlNVMlUMQFn0lwQPh57qF+DbCZ1Me2NcZhPlIQPBC8qebf4gfVTmBfyvgXf7W73s7IzWu4QmWgcGWZa5TMHBiLr3dkkRt9fjnrKck3TfGS0c13r9EfCpYkxJUSINJtYiVGAfyvrN5zUaNpS0SbKDlJQ8yweKP5dbubEyyYI8UWZXymWZvKkDeTOz77yL2SFDlZ2tRvHng3w1R5LvSiY/SJtO++7Zk0e/Jbjub5O9teLLGECMiLl1Fy48InbbXk9vCfuyzg/S0NnfZlnyRLQhZ604c0Vsuuxsta2lXdTGuWgoeY06y2jrZWr2JvLazyJ4Ql5Weq+ysYpZEWvAUav9xLJ3zuuzMi/knyLffKD5Ps8tM6hWdsbW4jk6HHI/e3u9/aVg3fs8nJVZF3mjhHys1QanQ1akVbBsY5DRaFdrtwxzwyVWrfIiFQwH8r/Y5xkJXIssVwtOvgWJYUTU/sDS9MVxTtJr3OfXSZ5wFrUXVybh5ZxHRyMieBNLws+Z8ydl1kXe00Y+hJ0KVcYSKtjKyVst3LNNwXkOzgXFMS5S+HsAD4diyQvwzl5OeTE5h3jzJ5Rd3vwkDbPKzxfwnwSvZ1cxCvgU0yV4lYdkXE8odedVjAfp3qsYlwWvtdvE5B3XQiZDDOLRcQUZ56xMpYLNbU5OfLuymE9n2k3RDDPyzlyRxzRul9eftcuflFkXeZRd3gRyVWlgJWa9iVorQJJ1gFyISuwoBwC+xEVqyE/ktZ6Rt3xFHsxQ8tRzNn8ir7vadrzMedOaUDHOyFO8sO9CCkM6V55YdvXIOkgflVkX+XXOeeXn3jyFUi7mfM5Wj5vzrU9xzwntSXqN3ry4bRu2CYrJwReGitiSMmxC8aA9ktdGiSFtnKNF7qE4kLdbPZvzwetL8u2wfhx59zk+3UmZF/Jd5HG2zwd36c0HG8I4217If4Ztf1JmXeSdMvJIp8WNoxi4tFPZdhomU8pBaGehCZQv2k8W1XLk5+58sFf7vLVx6JzXPdWUJ/JrdOetgo1rrrLP+4QcJXNdu+JQcYvao/WsUtLKgF3QwlNtq5+RZ74kb7IekYl1Ykmfsc8flVkXeVnPN7FVpzpGXZLPpo0IVLHsTDTGlVhBpn9UNixSQX0gfzSeL8ircLnPB29H1NGe1+9+r+6kzLrIr3S1l8GCOXm6mvOsxgVv1fHsrZv8CiM5K13tZ7c9N/Jw5dUFrAPJm75qyhP5vtueX1Z7sy9AnJH34fKMNntII2rqDiyprynZQVp3tq9feM5bt0mKVSW2RAWtpUKcGaEykMnGy7rvlXJxX7H8OeT/IeJ3u3Dz5d3j7e7VVlv8+f8BHwA45snAAAA=",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs",
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:39:11 GMT"
+      "Fri, 28 Mar 2025 05:08:53 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "108"
+      "82"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_3.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_3.json
deleted file mode 100644
index 7aa1c095f3..0000000000
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAI2QXUvDQBBF/0ueDWw23c3Hq9lCQdvSxhffxszURtJs2J2IQfzvbjCKIAVf5x4ud857hNS1r+SmehooKqODOda7g4luInobWgfc2r4CniMppIpFGktdS1mmeSnyx8C1GDKd0UpiJgCfQKskhbxRJwIx571n6BvawmVuQbu1XFFHTA+ecG2dkaYmzwEdnH2hhjdzo6ITggaC9CQJJWWIuiGhAuYCbR2t2771Z8K/8xJdpsUyb4GPTSDH7hr9/YzvYfBny1e6k7xOslLoUunf9OZLARYQNCgqBK5EsdIpCiVmBUEAjz4wt7v7/Z2pTRWODO6Zgomhs9OFet4wXRZHTTd6JhfLQv2A+/+4+fgEbAxRYtABAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42d70adba6513a8c5fea0",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "287"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:39:11 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "71"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasFlexBackupResource::getRestoreJob"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_3.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_3.json
deleted file mode 100644
index 3df7443d81..0000000000
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAI3QUUvDMBQF4P/SZwdpmqRrXl0HA93GVl/2dtd75ypdU5JbsYj/3RRlCjLwNefjcHPeE6S2eSU/VmNPiU125b7a7MrkLqG3vvHAjesWwFMkhdQzkc2kqaS0WWFTeYiuwZiZnJTEowA8gtFpBvPaiHyuprwLDF1Na7hMLejWjhfUEtNTIFw6X8qyosCR9t69UM2rqVHTCcEAQXaShJJyRFOT0JH5qJ2nZdM14Uz497zUWCVsqg4/eF9HObQ39PUzoYM+nB3f6E7nVZpbYaw2v/XqawIsIM6gqRCoRKFMhkILMTkGHkI095vH7UNZlYv4yOCfKS7Rt268UMcrpsv3RnU7BCY/k4W+wu1/tvn4BHZyiCrQAQAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42db0adba6513a8c60784",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "288"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:40:15 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "64"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasFlexBackupResource::getRestoreJob"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_1.json
index 169c6f2bc3..c287bed7af 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAI2Py07DMBRE/yVrKjlO7TzWTVE2oWrDht0ld0qD0jiybxEV4t9xBAIkNmxnjkZz3hLGOLzAX7vrjKRK9vWhu9vXyU2C13nwJIObNiRLpZU2K5WttO20rrKiUsVD5AaOnc2x1pwr4keyJs2o6M0RpJZ+CkJTj5bOywq71skGIwT3Abx1vtZ1hyARnb17Ri/NsmhwZLIEyo4arJEz2x7KRMxH2nkc+hP4MoL//kvtz78w0RxOTrbDNITTHzotujSvlK2M/U03n1ZcUjQzKBWvVbm2GSujFqvoJJcQmV3dbpr2NkZC/glRbR7d9YxJGsH5S7ofL0HgV7o03+DuP7LvH4kIM4WhAQAA",
+  "Body": "H4sIAAAAAAAAAI3QMU/DMBAF4P+SmUq2WztN56YoS6jasLAZ32sblMaRfUFEiP+OIxAgdWG99+l0794zQte+IkzNNCDbZIfy2Dwcyuwuw9vQBsut77eW50gJpRdiuVDrRsqNyDer4im5llJmchgFq/XaSCOVFmZ5kqpYzXkf2fYOtb3OW8jXnrfowHiMoJ0PpSobRE50CP4Fjqt5o8aJrLGwy5MCKeRExkHoxELSPuDoLqCxA93eJ/TvfbG3Q7x43rV9Gy+3WjQyn7XK/+rqqxW51bOQUheOnMkLcloW2syOLY8xmX1Zb6v6Po3YhjNStaHz0xU9V4zrd2nXjZERFuklP3D/n7Ifn/8QWFKhAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42d70adba6513a8c5fea0",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e62ea558616125063f1294",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:08 GMT"
+      "Fri, 28 Mar 2025 05:07:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "176"
+      "48"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_2.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_2.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_2.json
index e088272abe..2bdffe6339 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAI2QTU+EMBCG/wtnNymFlo/zsoYLml324m2WmRUMUNIORmL877bRqMlevM775M37zHuENA6vZLd2Wygqo2N1ah+OVXQX0dsyWODBzHvgEEkh1U4kO6lbKcukKGP55LkBfaYzSiVeBOAFtIoTyDstsjwN+ewY5o4amEILmsbwnkZiOjvCg7GVrFpy7NHFmhfquA6Niq4IGgiSqySUlCHqjoTymPW0sXTqesJ1JLzdF+vffW6GxfWGD8M8uP6GjvM2zkqhS6X/0vWXFRbgzRQVAlNRpDpBoYQIHAOvLjzs3DR1c+9PDPaZvNoymm2imWum6Vu6G1fHZHeyUD/g439kPz4BJyK0+qEBAAA=",
+  "Body": "H4sIAAAAAAAAAI3QMU/DMBAF4P+SmUq2WztN56YoS0BturAZ32sblMaRfUVUiP+OLRAgdWG99+l0794LwtC/Ily764RiVWzrXfewrYu7Am9THyz3flxbzpESSs/EfKaWnZQrUa4W1VNyPaXMlDAKVuulkUYqLcz8IFW1yPkY2Y4OrT3nLeRbz2sMYOwjaONDreoOkROdgn+B4yZv1DiQNRZ2flAghZLIOAidWEjaB+zcCXQZQLf3Cf17XxztFE+eN/3Yx9OtFp0ss1blX918tSK3eBZS6sqRM2VFTstKm+zY8iXmh+3btmnv04htOCJVmwZ/PWPkhnH+Lu2GS2SEWXrJD3z8T9mPT6g+asuhAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42db0adba6513a8c60784",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e62ea558616125063f1294",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "275"
+      "273"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:39:21 GMT"
+      "Fri, 28 Mar 2025 05:07:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "82"
+      "55"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_3.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_3.json
new file mode 100644
index 0000000000..b8898ed990
--- /dev/null
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_3.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAI3QS2uEMBQF4P/iukISTXxsawaEdmaYsZvZpcm1Y1EjybVUSv97I31CGZhtzsfh5rxFBvruBdzSLBNEZXSQx2Z3kNFNBK9T5xR2dqwUrhEjjMckiVneUFqSrEyLU3CdCZnIQDBQnOeCCso4EUlLWZGu+ehRjRq2alhbjN1arKAHhAcPZmOdZLIBj4FOzj6Dxnpt5NAaJRSopGVgGGTGCA2EB+aCtg423dj5M5j/5xFekrzk7PSLjzrIub+kvz/jRzX5s8VL3aSh2apZ9lfXnxMYnT4SSnmhjRZZYTSnBRerQ4WzD+Z2d7+/k42swiMq9wRhiam3ywAj1gjD10a6nz2Ci8OCP3B/zTbvH3u2vxjQAQAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e62ea558616125063f1294",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "285"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:53 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "47"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasFlexBackupResource::getRestoreJob"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_4.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_4.json
new file mode 100644
index 0000000000..7c936af555
--- /dev/null
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ea558616125063f1294_4.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAI3QS2uEMBQF4P/iukISTXxsawaEdmaYsZvZpcm1Y1EjybVUSv97I31CGZhtzsfh5rxFBvruBdzSLBNEZXSQx2Z3kNFNBK9T5xR2dqwUrhEjjMckiVneUFqSrEyLU3CdCZnIQDBQnOeCCso4EUlLWZGu+ehRjRq2alhbjN1arKAHhAcPZmOdZLIBj4FOzj6Dxnpt5NAaJRSopGVgGGTGCA2EB+aCtg423dj5M5j/5xFekrzk7PSLjzrIub+kvz/jRzX5s8VL3aSh2apZ9lfXnxMYnT4SSnmhjRZZYTSnBRerQ4WzD+Z2d7+/k42swiMq9wRhiam3ywAj1gjD10a6nz2Ci8OCP3B/zTbvH3u2vxjQAQAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e62ea558616125063f1294",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "285"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:54 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "67"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasFlexBackupResource::getRestoreJob"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_2.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_1.json
index 36a07467a1..22b382111b 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAI2QTU/DMBBE/0vOVHKc2vk4k6JcAmrTC7clO6VBaRzZW0SF+O84AgFSL1x3nkbz9j1hjMMr/KW7zEiqZFvvuvttndwkeJsHTzK46ZZkibTSZqWylbad1lVWVKp4jNzAMbM51ppzRfxE1qQZFb05gNSST0Fo6tHSaWlh1zq5xQjBPoA3zte67hAkorN3L+ilWRoNDkyWQNlBgzVyZttDmYj5SDuPXX8En0fw9b7U/u4LE83h6GQzTEM4XtFp0aV5pWxl7F+6+bLikqKZQal4rcq1zVgZtVhFJzmH5WH7tm3au3gS8s+IavPoLidM0ghO39L9eA4Cv9Kl+QEf/iP78QneJgEcoQEAAA==",
+  "Body": "H4sIAAAAAAAAAI3PwU7DMBAE0H/JmUqOG9tNzk1RLqFqw4Wb8U7boDSO7C2iQvw7jkCA1AvXnafRzntGGPpXhGt3nZBV2a7edw+7OrvL8Db1wXLvx7XlOZJCqoVYLuSqy/NKrCqlnpLrKWXaQEvAGKHlwRUr2GVBJYo5HyPb0aG157mFfOt5jQGMxwja+FDLukPkRKfgX+C4mRsVDmS1TUUHCZIwRNpBqMRC0j5g706gywC6/U+o3//iaKd48rzpxz6ebrXoclMJU0nzVzdfq8gVzyLPVenIaVOSU3mp9OzY8iUms63bddPepxPbcESaNg3+esbIDeP8PdoNl8gIi1yWP3D7n7Efnys474ehAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42d70adba6513a8c5fea0",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e62ee77062fc48ea34d9e4",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "274"
+      "273"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:17 GMT"
+      "Fri, 28 Mar 2025 05:08:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "84"
+      "51"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_2.json
similarity index 62%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_2.json
index da1838e1e2..5ac9698290 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAI3PT0+EMBAF8O/CWZJSaPlzhjVccLOLF2+zzKxggJJ2MBLjd7dEoyZ78Trvl5d57wHSOLyS3dptoaAITtW5fThVwV1Ab8tggQczl8B7JIVUoYhDqVspizgvIvnk3YA+0yklEi8C8AJaRTFknRZpluz57BjmjhqY9hY0jeGSRmJ6dIQHYytZteTY08WaF+q43hsVXRE0EMRXSSgpRdQdCeWZ9dpYOnc94ToS3v4X6d//3AyL6w0fhnlw/Y2OsjZKC6ELpf/q+msV5uCXKcoFJiJPdIxCCbE7Bl6dN8eqKevm3p8Y7DP5actotolmrpmm79HduDomG8pc/cDjf8Z+fAJwDIZjoQEAAA==",
+  "Body": "H4sIAAAAAAAAAI2QwU7DMBBE/yVnKjlubDc5N0W5BNSmF27GO22D0jiyt4gK8e84AgFSL1x3nkbz9j0jDP0rwrW7TsiqbFvvuodtnd1leJv6YLn349ryHEkh1UIsF3LV5XklVpVST4nrKWXaQEvAGKHlwRUr2GVBJYo5HyPb0aG157mFfOt5jQGMfQRtfKhl3SFyQqfgX+C4mRsVDmS1TUUHCZIwRNpBqISFRPuAnTuBLgPodp9Qv/viaKd48rzpxz6ebmnR5aYSppLmL918WZErnkWeq9KR06Ykp/JS6Zljy5c4P2zftk17n05swxFJbRr89YyRG8b5W9oNl8gIi1yWP+Djf2Q/PgF8Ft0eoQEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42db0adba6513a8c60784",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e62ee77062fc48ea34d9e4",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:39:12 GMT"
+      "Fri, 28 Mar 2025 05:09:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "68"
+      "50"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_4.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_3.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_4.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_3.json
index c9b3920ac3..41b646de26 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_4.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e62ee77062fc48ea34d9e4_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAI2QXUvDQBBF/0ueDWw23c3Hq9lCQdvSxhffxszURtJs2J2IQfzvbjCKIAVf5x4ud857hNS1r+SmehooKqODOda7g4luInobWgfc2r4CniMppIpFGktdS1mmeSnyx8C1GDKd0UpiJgCfQKskhbxRJwIx571n6BvawmVuQbu1XFFHTA+ecG2dkaYmzwEdnH2hhjdzo6ITggaC9CQJJWWIuiGhAuYCbR2t2771Z8K/8xJdpsUyb4GPTSDH7hr9/YzvYfBny1e6k7xOslLoUunf9OZLARYQNCgqBK5EsdIpCiVmBUEAjz4wt7v7/Z2pTRWODO6Zgomhs9OFet4wXRZHTTd6JhfLQv2A+/+4+fgEbAxRYtABAAA=",
+  "Body": "H4sIAAAAAAAAAI3QzWrDMBAE4HfxuQFJsSRb18aBQJuExL3kpmo3jYtjGWldakrfvTL9hRLIVfMxrOYtA2ybFwxjPfaYmWxX7evNrspuMnztm2Cp8d3C0hQJJuSMzWeiqDk3rDBSHpJrIGVKoxKIWjMlji4v0M5zKDGf8i6S7Ryu7XlqAb/2tMAWCR8iwtKHSlQ1Rkq0D/4ZHa2mRolHsMqmoqNAEKgBlEMmEwtJ+4DLpmviCeH/eUwaVhpZHH7x3iU5tJf092diZ/t48nSpm9VcG6aN0H/16nMCcPkj41yWDpzSJTjJS6kmR5aGmMzt5n57V9XVIj2SDU+YluhbP56xoxXh+Wsj1w6RMMy4KH/g9ppt3j8AA8j+7NABAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42d70adba6513a8c5fea0",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e62ee77062fc48ea34d9e4",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:39:11 GMT"
+      "Fri, 28 Mar 2025 05:09:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "99"
+      "62"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_1.json
index eed98e5e5f..b54946cd41 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAJ3VTW+bMBgH8O/CoacmPH7HSNWktdlp63rIdti0g7EfGlQCCJuqUtXvPjcFKZWakuTAAfzH9s+vz0ldNQ8+yf8+J5seyyRPNiF0Pk9TW7eDWzh8XG7b5r51xdK229R0VWpCbXz6SNP7vh06nwosnZEGDSspOorKOWkRRFrW+HRdDz5g71PX3rbhBmsM+Muj+9b2K7paow9pYezD0KW+MZ3ftMF/qRpbDw6v26EJV6Ef8KIz93g7bK/IRRVw6++wv4tfrghAcpn0WMd+e6zL5OXf66sf6vBmwqeu6k2o2iYmKFCxALagck1UDiIn8Cf+XlZN5Tfraot7GZLtMjIX8jVTuVgmldNGIReowXHQXDIHYteF3RDdfP0doW9tZUtYiljg7QbdUKP7uP6pDz6YPhyKcDFGwhBVyfXPH3ffV+vVTfJyeUiojhDqXUbl9J3QlDqjjhVSEhWV6CTNyCGh/Eyo54V6HGRyujCbF1KYhGpfaHkBhAhtnZVKOyuIFvIc4Vj/Z8IxEoX8ZKE+QkgmIewLnbaq4NICLYWIk2gBSnuWkMwLySgEfaqQwRFCOlbP361SROcM5YW1klCZUWLpmUI6L5wi7ORVysgRQjYJxZ4QgZUiAwYWDWXCFlphiWcJ2bxwijB2mpAv4Bghn4T7+xBJPEVNwRlxyBV9fSRlZwn5vHCKMHmykB4hFKOQ6X0hRSoIGCHjLiRWQTxuzHlzKOaFU+TtsPtIGO/G0AZT7+7VJM9e/gMzy5M+/gcAAA==",
+  "Body": "H4sIAAAAAAAAAJ3Vz2+bMBQH8P+FQ09NeP4NSNGkpdlp63rIdti0g7EfCSoBhE1Vqer/PqcNEodWEA5IgL8Yf0B+7yWqyvrRRdnfl+jYYRFl0dH71mVxbKqmtyuLT+tTUx8am69Nc4p1W8baV9rFTzQ+dE3fulhgYbXUqFlB0VJU1kqDIOKiwudt1TuPnYttc9/4O6zQ4y+H9lvT7ehuj87HuTaPfRu7Wrfu2Hj3paxN1VvcNn3tN77r8abVB7zvTxtyU3o8uQfsHsKdDQGIbqMOq7Buh1URvf47X7q+8u8mfG7LTvuyqUOCAhUrYCua7InKQGQE/oTHi7Iu3XFfnnCcgbeMyqg6Z0obxqSyhudAiEiNNVKl1giSChnG3z7R3dffAfr+rmQN6/OAM0e0fYX24/mHNTivO/9xRGaEXyK+D6po+/PHw/fdfncXvd5+JkxnCMkghLHQpkblXBqghRBguQEozCIhmRaSixDSa4UMZgjpZXoux0JEazXluTGSUJlQYuhCIZ0WDhEmrhaSGUI2CMVIiMAKkQADg5oyYfJUYYGLhGxaOEQYu07IVzBHyAfheB8iScHqnDNikSt6PiRli4R8WjhEmLxaSGcIxUXI0rGQIhUEtJBhFxKjIJQbvewfimnhEHkvdlcJ2QyhvFQaGFca5IyhJLlFlQK3BUod2sgioZwWDhF+vZDPEKqhltKxUCRCaWqZ5QowIeGUJ+kioZoWqqGWJp8JQ2/0jdfVW1+NsuT1PzwBcq7+BwAA",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/snapshots",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "583"
+      "576"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:06 GMT"
+      "Fri, 28 Mar 2025 05:07:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "101"
+      "50"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67d9a7e45e90d409463d0500_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67dc4b01159cdc679dc51956_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67d9a7e45e90d409463d0500_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67dc4b01159cdc679dc51956_1.json
index 9505dca4d4..e2b27d6352 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67d9a7e45e90d409463d0500_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67dc4b01159cdc679dc51956_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHXOPwvCMBCH4e+S2ZZrm0vbjNpuig7BwS2Y0wZsK0kKgvjdjf/AQef34X53ZXQ5W6eDHQcmWQ45JlAkuVBZKQFlBjs2Ywc7WN8p29OXyaqnERLFw1gTmyhNrUviSDUYDjUXhQEEiL0fh+PYzLfk/GurSiHFGPy+IzOdyPy+//nBB+3CP8LxTcLkY1+sV5tlq9qG3e48jCkp4QAAAA==",
+  "Body": "H4sIAAAAAAAAAG3OvQ6CMBSG4XvpLOScSlvoqLBpdGgc3LCt0kTAtCUxMd674E/iwPw+Od95EHu/OV9H13dEEgqUJbBMaK5QSGAS4UgW5Ow6FxrlWvtv4G2EpGIyzoyNC6OzEyCyQhvNRWE0w4Lxsbd9d+nL1cH68NnKU0inEHRjzXC1Zv7+74cQax/nCZeYfUkcwtjXu+1+U6mqJM8XT06ZfOEAAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/snapshots/67d9a7e45e90d409463d0500",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/snapshots/67dc4b01159cdc679dc51956",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "166"
+      "167"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:06 GMT"
+      "Fri, 28 Mar 2025 05:07:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "72"
+      "67"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
index 66ef23fdc8..337a27a038 100644
--- a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAE1Q0YrCMBD8lzyr1Ngm2reqPRFExPTO414kNtsSbNOSpIIn/vttscfdQ2DJzOzszINcZH7tWgHea1M6Ej8IGHmpQJHY2w6eI5JXnfNgs3sLJCbH9LDbrhKRZgShxhjIvW6M8HbQ9woL0sMaHwpoQKNxMBtTlk1ZPONxGH6htLRN127RhURQKMkkyFlBQVHgSrEcgghJuscZh5CqaL7g/EI5ZwWXPFTzHPG6MWWzXn6AdXgDcueTYMIQMLLuvYfTx3TRb2ttc9MK7P+wfXycDwO0f+mSk0C+0u4q9DdsliSOJsHfgoH1tks/kWahRPPh712c00Rk5ynBHpzHCgZgdUyTbLvfoAAvqrWRfW3o618Fpr+tF7JyMCK3V6YjVCAdiDvmqHHNLhPk+QODQZZYtgEAAA==",
+  "Body": "H4sIAAAAAAAAAE1Q0WrCMBT9lzyrpOkau75V7UQQEdPNsReJzW0JtmlJUsGJ/75b7NgeAuGec+6559zJWRaXvhPgvTaVI8mdgJHnGhRJvO3hMSFF3TsPNr91QBJyyPbbzTIVWU4Qao2BwuvWCG9H/aCwID2s8KGAURZNaThlcU6jhM4T9vKF0sq2fbdBFxJBqSSXIMOSgWIwV4oXQCMk6QHnc+AM4iKKecADFlEelgENKeJNa6p2tfgA6/AG5MYzOuMIGNkM3uPp04C94rCz7VUrsP/DDvHxvx+h3VOXHgXylXYXob9hvSBJNKN/C0bW2zb7RJqFCs3H2bs4ZanITwHBHpzHCkZgecjSfLNbowAvarSRQ23o658FZr+tl7J2MCHXZ6YD1CAdiBvmaHDNNhfk8QNJxiJPtgEAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:44 GMT"
+      "Fri, 28 Mar 2025 05:07:24 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "510"
+      "426"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
index 84e1ae3c2e..bda92da757 100644
--- a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAI2Py07DMBRE/yVrKjlO7TzWTVE2oWrDht0ld0qD0jiybxEV4t9xBAIkNmxnjkZz3hLGOLzAX7vrjKRK9vWhu9vXyU2C13nwJIObNiRLpZU2K5WttO20rrKiUsVD5AaOnc2x1pwr4keyJs2o6M0RpJZ+CkJTj5bOywq71skGIwT3Abx1vtZ1hyARnb17Ri/NsmhwZLIEyo4arJEz2x7KRMxH2nkc+hP4MoL//kvtz78w0RxOTrbDNITTHzotujSvlK2M/U03n1ZcUjQzKBWvVbm2GSujFqvoJJcQmV3dbpr2NkZC/glRbR7d9YxJGsH5S7ofL0HgV7o03+DuP7LvH4kIM4WhAQAA",
+  "Body": "H4sIAAAAAAAAAI3QMU/DMBAF4P+SmUq2WztN56YoS6jasLAZ32sblMaRfUFEiP+OIxAgdWG99+l0794zQte+IkzNNCDbZIfy2Dwcyuwuw9vQBsut77eW50gJpRdiuVDrRsqNyDer4im5llJmchgFq/XaSCOVFmZ5kqpYzXkf2fYOtb3OW8jXnrfowHiMoJ0PpSobRE50CP4Fjqt5o8aJrLGwy5MCKeRExkHoxELSPuDoLqCxA93eJ/TvfbG3Q7x43rV9Gy+3WjQyn7XK/+rqqxW51bOQUheOnMkLcloW2syOLY8xmX1Zb6v6Po3YhjNStaHz0xU9V4zrd2nXjZERFuklP3D/n7Ifn/8QWFKhAQAA",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:07 GMT"
+      "Fri, 28 Mar 2025 05:07:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "766"
+      "170"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_2.json b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_2.json
index 33851499bd..74331cfa98 100644
--- a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_2.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAI3PT0+EMBAF8O/CWZJSaPlzhjVccLOLF2+zzKxggJJ2MBLjd7dEoyZ78Trvl5d57wHSOLyS3dptoaAITtW5fThVwV1Ab8tggQczl8B7JIVUoYhDqVspizgvIvnk3YA+0yklEi8C8AJaRTFknRZpluz57BjmjhqY9hY0jeGSRmJ6dIQHYytZteTY08WaF+q43hsVXRE0EMRXSSgpRdQdCeWZ9dpYOnc94ToS3v4X6d//3AyL6w0fhnlw/Y2OsjZKC6ELpf/q+msV5uCXKcoFJiJPdIxCCbE7Bl6dN8eqKevm3p8Y7DP5actotolmrpmm79HduDomG8pc/cDjf8Z+fAJwDIZjoQEAAA==",
+  "Body": "H4sIAAAAAAAAAI3PwU7DMBAE0H/JmUqOG9tNzk1RLqFqw4Wb8U7boDSO7C2iQvw7jkCA1AvXnafRzntGGPpXhGt3nZBV2a7edw+7OrvL8Db1wXLvx7XlOZJCqoVYLuSqy/NKrCqlnpLrKWXaQEvAGKHlwRUr2GVBJYo5HyPb0aG157mFfOt5jQGMxwja+FDLukPkRKfgX+C4mRsVDmS1TUUHCZIwRNpBqMRC0j5g706gywC6/U+o3//iaKd48rzpxz6ebrXoclMJU0nzVzdfq8gVzyLPVenIaVOSU3mp9OzY8iUms63bddPepxPbcESaNg3+esbIDeP8PdoNl8gIi1yWP3D7n7Efnys474ehAQAA",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "274"
+      "273"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:39:12 GMT"
+      "Fri, 28 Mar 2025 05:08:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "250"
+      "206"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/memory.json b/test/e2e/.snapshots/TestFlexBackup/memory.json
index 6e3da55796..cfeb195750 100644
--- a/test/e2e/.snapshots/TestFlexBackup/memory.json
+++ b/test/e2e/.snapshots/TestFlexBackup/memory.json
@@ -1 +1 @@
-{"generateFlexClusterName":"cluster-295"}
\ No newline at end of file
+{"generateFlexClusterName":"cluster-129"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json b/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-419_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
rename to test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-419_1.json
index f3756ff9f1..5778edc664 100644
--- a/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-419_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci01IGNhbm5vdCBiZSB1c2VkIGluIHRoZSBDbHVzdGVyIEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX0ZMRVhfQ0xVU1RFUl9JTl9DTFVTVEVSX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci01Il0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci00MTkgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTQxOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-5",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-419",
   "Headers": {
     "Content-Length": [
-      "185"
+      "189"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:14 GMT"
+      "Fri, 28 Mar 2025 05:07:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "69"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json b/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
rename to test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_1.json
index fe6e30ccff..8c18f9193e 100644
--- a/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-5",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-419",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:14 GMT"
+      "Fri, 28 Mar 2025 05:07:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "229"
+      "258"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-419_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
rename to test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-419_1.json
index d1c5407abf..10460d1b75 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-419_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci01IGNhbm5vdCBiZSB1c2VkIGluIHRoZSBDbHVzdGVyIEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX0ZMRVhfQ0xVU1RFUl9JTl9DTFVTVEVSX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci01Il0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci00MTkgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTQxOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-5",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-419",
   "Headers": {
     "Content-Length": [
-      "185"
+      "189"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:14 GMT"
+      "Fri, 28 Mar 2025 05:07:03 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "89"
+      "64"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
index 3d8917f5bf..831a6182b4 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAMVWbWvbMBD+L/rQL4tjWfFLYgglTdwRCCXU6TZWRpGtc2JqW0aSw9rS/75zXmjHmq4pbAUbZN3dc3fPPQd+IEVe3WoSXj+QlYKMhGRlTK1D204L2QhLwLpbymopRdJNZWnzOre5Kbi218xeKtnU2vYgE9znwHsZA8EgEMJPgXp2VsDPcdFoA0qf5lVaNALGsqnM0KgGTmq+hIumHDonuYFSz0HN8WboUEo6REGBxWgoMvL4o/3UTWG2hSY8vW3qGIzJqyVePRCoeFKAIGGL+9gh6Tbp4q4GBLmM5rPpeBRHC8RNZVVBanJZxUbt47XhleAKAciuWSSAp1aSlpi2tvQKjRal+HSXpceLstqzsmGoAhOygDpB58Ug5z1B7PUg+1TrYssjb8wqlo1KYchFmVcnCuoiTzkyNNzMyrpf5qsm3YMjC/uGY7V+6vmTVmvsW8hKGgEFGGg0iEwqYHg+VA5p+VbADUzwRTRGmWs5zHIGCycIqRc69Dum3Ihl2lJ8SC/olLd2P/Bdj7m+CzR1fBpQOmD9gddD+yb35OwLCgoniL79Lu36aKh42eYW8kKayab2K6z9XKqIRQvQBl1qJde5APVcOK2U8DzfmS62KKOvMfqLXN/G+T18PiOh16VPADuv81n0bSPUJZayu7uKb6JRvLhxWlaQZAM7w3Qyi9DZ8DbvNQoa5Ymj4q0QMbvZSjJ6ruMOWW/bvMR+uIb4DjVdItZsESP8/9wDyFY0aJLf9iBPnNxV9LCk/wxy3hPEXg86ag8M95V66x7syLPYwDtUwkva9yzas5i/cPywF4Sue6z2wWXC6w+CIGFB4GcBD1zRT9+g/Wf1frTar+aT0WJ68fkIxWe80B8g+b8MsB86vfcMMPC4SLjvOT3eT70sY/SIAX74+MaX0T8YX4shDS82fwAk7D3+As+kiWl9CAAA",
+  "Body": "H4sIAAAAAAAAAMVU72vbMBD9X/ShXxbHshI7iSGUNHFLIIRQu9tYGUWxzompLBlJDmtL//ed84P2Q7utgzGwwdbdvbt779lPRJbq3pL49olsDRQkJlvnahv7fi51IzwBu26l1UaLdTfXlc/r0udOcuvvmL8xuqmtH0IheMSB9woGgsFAiCgHGvqFhB9T2VgHxp6XKpeNgKlulBs708BZzTewbKpxcFY6qOwKzApPxgGlpEMMSBzGgizI8/f21TbSHQZd8/y+qVNwrlQbPHoioPhagiBxi/vcIfmhafZQA4JcJ6vFfDpJkwxxc60U5K7UKnXmVG8dV4IbBCDHZZEAnnvrvMK2tWe3GPQoxau7qUIuK3ViZc+QAhezAQ0GnTeLgr8pYr8u8s+tlQceeeO2qW5MDmMuqlKdGahlmXNkaLzXynvclNsmP4EjC6eFU7N72fmTNTvcW2ilnQAJDhoLotAGGD6/Nw5p+TbAHczwRjRGWd8LmBeMsmAQ0zAO6DdsuTfLvKX4Pb9gUtnGo0HUD1k/6gPNg4gOKB2x4SjsYXzfe3bxGQ2FCmLusEu7EQYUr9reQi+1m+1nv8HZL7VJWJKBdZhSG70rBZjXxmmthM+rY2h5QJl8STFflPY+LR/h6oLEYZe+AByzLhfJ171RNzjK8ewmvUsmaXYXtKwgyQ6OgflskWCy423fWzQ02hOl4q0Rsbs7WDJ57eMO2R3WvMZ9uIX0AT1dIdYiSxH+H3wHbygZerTnsWGGMlIUs/dRJSHC00E4jIIoYCGNegVdD8UfKHkc3esHo/+t3fQ6mWTz5dUH9Cu4tL8RsMXQjsv9D5HE7Pknq41mxIwFAAA=",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "714"
+      "638"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:14 GMT"
+      "Fri, 28 Mar 2025 05:07:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "190"
+      "129"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_2.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_1.json
similarity index 65%
rename from test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_2.json
rename to test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_1.json
index 3c13294a5d..725f4cfed6 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_2.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXWvCMBT9L3lWadOlSt90ZiIUEdN9sDEkNrcl2KYlSQUn+++7wY7tIXDJOeeee86NnGR5HnoB3mtTO5LdCBh5akCRzNsBviekbAbnwRbXHkhGDnyfbx+XghcEoc4YKL3ujPB21AeFBelhjQ8FNKJsGiVTmhZxmiWLLE7eUVrbbui36EIYVEqmEmRSUVAU5kqlJUQMSTrg6RweqJozqU4yZXEiFyWrKhoh3nam7tarF7AOb0DuYhbNUgSMbIP3ePo07Optd9EK7P+oITzO+xHa3VXLV4F8pd1Z6C/YrEjGZtHfgpH1lPM3pFmo0Xr8exZHvhTFMSbYgvNYwAisec6L7W6DAi+D98cnTmBbbWSoDy/w9yL5b/uVbBxMyOWe7QANSAfiinlaXJgXgnz/AA3N9mC+AQAA",
+  "Body": "H4sIAAAAAAAAAE1QYWvCMBT8L/mskrZL2vVb1U4EETHdHBtDYvNaim1aklRw4n/fK3ZsHwKPd3e5d3cjJ5mf+06Ac5UuLYlvBLQ81aBI7EwP9wnJ6946MNm1AxKTfbrbrBeJSDOCUKs15K5qtXBm1A8KA9LBEh8KfOqzKQ2mfpRRFtMwpsEHSkvT9t0aXQiDQkkuQQaFD8qHUCmeA2VIqgach8BxG7KIe9zzGeVBQU+RQrxpddku529gLN6A3GhGZxwBLZvBezx9+uQ947Iz7aVSYP6HHeLjvBuh7UOXHATyVWXPovqG1ZzEbEb/PhhZL5v0HWkGSjQfd6/imCYiO3oEe7AOKxiBxT5NsvV2hQInB+/PL5zANJWWQ4F4gXtUmf72X8jawoRcHun2UIO0IK6YqMEPN5kg9x9X/00xwAEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-5",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-419",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "321"
+      "322"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:15 GMT"
+      "Fri, 28 Mar 2025 05:07:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "84"
+      "62"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_2.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
rename to test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_2.json
index 6112d2f8ad..9b26da161d 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXWvCMBT9L3lWaeOSbH3TmYlQREz3wcaQ2NyWYpuWNBWc7L/vBju2h8Al55x77jlXctT5aegUeF/ZsifJlYDVxxoMSbwb4HtC8nroPbjs0gFJyF7u0s3jQsmMINRaC7mvWqu8G/VB4UB7WOFDAY0om0bzKeVZzJO5SFj8jtLStUO3QRfCoDCaa9DzgoKhIIzhOUQMSVXAuYA7aljxIMSRCsELoQWLOEe8aW3ZrpYv4Hq8Abn3s2gWAKub4D2ePo3DX+fac2XA/c8a0uO8G6HtTbZ4Vcg3VX9S1ReslyRhs+hvwch6SuUb0hyU6D3+PauDXKjsEBOsoffYwAisZCqzzXaNAq+D98cnTuCayurQH17gb03K3/oLXfcwIedbuD3UoHtQFwzU4MI0U+T7B3VPhXG/AQAA",
+  "Body": "H4sIAAAAAAAAAE1QXWuDMBT9L3luS9QlOt/a1ZWClNK4DzZGSc1VQjVKjIWu9L/vio7tIXC555yce86NnGR+7lsBzmlTdiS+ETDyVIEisbM93Gckr/rOgc2uLZCYHJJ9un1aiiQjCDXGQO50Y4Szk35QWJAO1vhQ4FOfzWkw96OMspiGMQ0+UFrapm+36EIYFEpyCTIofFA+hErxHChDkh5wHgLHbcgi7nHPZ5QHBT1FCvG6MWWzXr2C7fAG5EYLuuAIGFkP3tPp8wfvEZetbS5agf0fdoiP836CdqNu+SaQr3R3FvobNisSswX9+2BiPafJO9IslGg+7V7EMVmK7OgR7KFzWMEErJM0yba7DQqcHLw/v3ACW2sjhwLxAjdWmfz2X8iqgxm5jOkOUIHsQFwxUY0fppkg9x/YTEk2wAEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-16",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-419",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "321"
+      "322"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:52 GMT"
+      "Fri, 28 Mar 2025 05:07:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "97"
+      "63"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_2.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_3.json
similarity index 65%
rename from test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_2.json
rename to test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_3.json
index d6cc2fe660..0248b3fdce 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_2.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-419_3.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItMTYgZXhpc3RzIGluIGdyb3VwIDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNS4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJDTFVTVEVSX05PVF9GT1VORCIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci0xNiIsIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSJdLCJyZWFzb24iOiJOb3QgRm91bmQifQ==",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItNDE5IGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItNDE5IiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-16",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-419",
   "Headers": {
     "Content-Length": [
-      "202"
+      "204"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:12 GMT"
+      "Fri, 28 Mar 2025 05:07:20 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "56"
+      "46"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json b/test/e2e/.snapshots/TestFlexCluster/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
index f85cc2f73b..8a1e9c41b8 100644
--- a/test/e2e/.snapshots/TestFlexCluster/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3lWadNLlL5V7UmhiJjeB/cisdmWYJuWJBU88b/fFnvcPQSWzMzOztzJWZaXoRfgvTa1I/GdgJHnBhSJvR3gMSNlMzgPtrj1QGJyTA95tklEWhCEOmOg9LozwttJPyosSA9bfCigAWXzIJpTXoQ8jlZxGH2htLbd0GfoQhhUSnIJMqooKApLpXgJAUOSHnG+hBeqlkyqs+QsjOSqZFVFA8TbztTddv0O1uENyF0tggVHwMh29J5On4+7ettdtQL7P+oYHufDBO2fquRDIF9pdxH6G3ZrErNF8LdgYr3m6SfSLNRoPf29iVOaiOIUEmzBeSxgAjbHNCmy/Q4FeE+rjRxLQ1//rC/97bySjYMZuT4THaEB6UDcMEWLa/JCkMcPEvsnTLQBAAA=",
+  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3lWSdtL2utb1Z4IImJ6H9yLxGZbgm1aklTw5P77bbHH3UMg7Mzs7MydnGV5GXoB3mtTO5LeCRh5bkCR1NsBvmekbAbnwRa3HkhKjvlht11lIi8IQp0xUHrdGeHtpB8VFqSHNT4UhDRkcxrNw6SgLKVxSqNPlNa2G/otuhAGlZJcgoyqEFQIsVK8BMqQpEecx8BxGrOEBzwIGeVRRc+JQrztTN2tl29gHd6A3GRBFxwBI9vRezp9/hQ847C33VUrsP/DjvHxf5ig/UOXvQvkK+0uQn/BZklStqB/CybWyy7/QJqFGs2n2as45ZkoTgHBHpzHCiZgdcyzYrvfoAAvarWRY23o6x8F5r+tV7JxMCPXR6YjNCAdiBvmaHHNrhDk+wcnlgWHtgEAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "314"
+      "316"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:13 GMT"
+      "Fri, 28 Mar 2025 05:07:02 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "690"
+      "449"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/memory.json b/test/e2e/.snapshots/TestFlexCluster/memory.json
index 684eb4976f..c7356d06e7 100644
--- a/test/e2e/.snapshots/TestFlexCluster/memory.json
+++ b/test/e2e/.snapshots/TestFlexCluster/memory.json
@@ -1 +1 @@
-{"flexClusterName":"cluster-5"}
\ No newline at end of file
+{"flexClusterName":"cluster-419"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-16_1.json b/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-831_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-16_1.json
rename to test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-831_1.json
index a3e43d2f9e..3fb6d5e0bb 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-16_1.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-831_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci0xNiBjYW5ub3QgYmUgdXNlZCBpbiB0aGUgQ2x1c3RlciBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9GTEVYX0NMVVNURVJfSU5fQ0xVU1RFUl9BUEkiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItMTYiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci04MzEgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTgzMSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-16",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-831",
   "Headers": {
     "Content-Length": [
-      "187"
+      "189"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:51 GMT"
+      "Fri, 28 Mar 2025 05:06:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "66"
+      "43"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json b/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
rename to test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_1.json
index 87fc40b47c..c5e3ce1685 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-16",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-831",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:51 GMT"
+      "Fri, 28 Mar 2025 05:06:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "446"
+      "325"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json b/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
rename to test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_1.json
index 825b3c596f..0e180faf0e 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3nW0qaXKH2r2hNBREzvgzsOic22FNu0JKngif/9Ntjj7iGwZGZ2duZGTrI4D70A52pdWZLcCGh5akCRxJkB7hNSNIN1YPJrDyQhh2y/3SxTkeUEoU5rKFzdaeHMqPcKA9LBCh8KaEjZNIynlOcRT+J5EsUfKK1MN/QbdCEMSiW5BBmXFBSFmVK8gJAhqfY4n8ETVTMm1UlyFsVyXrCypCHibaerbrV4BWPxBuTOgzDgCGjZeu/x9Knf1ZvuUisw/6P68DjvR2j3UKVvAvmqtmdRf8N6QRIWhH8LRtbzNntHmoEKrce/F3HMUpEfI4ItWIcFjMDykKX5ZrdGgZPe+/MLJzBtraWvDy9wjyKz3/ZL2ViYkMsj2wEakBbEFfO0uHCbC3L/AYJ+8me+AQAA",
+  "Body": "H4sIAAAAAAAAAE1QYWvCMBT8L/mskrYkdv2mMxOhiJhuk40hsXktwTYtaSo48b/vFTu2D4HHu7vcu7uRk8rPfSvBe2PLjiQ3AladKtAk8a6H+4TkVd95cNm1BZKQvdilm+eFFBlBqLEWcm8aK70b9YPCgfKwwoeCkIZsSqNpGGeUJZQnbP6B0tI1fbtBF8Kg0IorUFERgg5hrjXPgTIkmQHnc+C4DVjMAx6EjPKooKp4QrxubNmslm/gOrwBufGMzjgCVtWD93j6NI4CXLauuRgN7n/YIT7OuxHaPnSLd4l8bbqzNN+wXpKEzejfByPrJRUHpDko0XzcvcqjWMjsGBDsofNYwQisRCqyzXaNAq8G788vnMDVxqqhQLzAP6oUv/0XqupgQi6PdHuoQHUgr5ioxg/TTJL7DwnYoInAAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-5",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-831",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:14 GMT"
+      "Fri, 28 Mar 2025 05:06:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "92"
+      "60"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_3.json b/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_2.json
similarity index 65%
rename from test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_3.json
rename to test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_2.json
index 14507bb955..421cbbfa1b 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_3.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-831_2.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItNSBleGlzdHMgaW4gZ3JvdXAgNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1LiIsImVycm9yIjo0MDQsImVycm9yQ29kZSI6IkNMVVNURVJfTk9UX0ZPVU5EIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTUiLCI1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUiXSwicmVhc29uIjoiTm90IEZvdW5kIn0=",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItODMxIGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItODMxIiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-5",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-831",
   "Headers": {
     "Content-Length": [
-      "200"
+      "204"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:19 GMT"
+      "Fri, 28 Mar 2025 05:07:02 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "68"
+      "43"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json b/test/e2e/.snapshots/TestFlexClustersFile/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
index b0e478dcbe..476cf0db85 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAE1RYWvCMBT8L/k8pY1rsvVb1U4EETHdHBtDYvNaim1aklToxP++F+zYPgTCu7vcu8uVnGR+7jsBzlW6tCS+EtDyVIMisTM93B5IXvfWgcmGDkhM9ulus14kIs0IQq3WkLuq1cKZUe8VBqSDJR4U0IBGk2A2oSwLWTzjcRR+oLQ0bd+t0YVEUCjJJMhZQUFR4EqxHIIISZXHGYdHqqLimfMT5ZwVXPIoYAzxptVlu5y/gbG4A3KfpsHUA1o23ntcfRL6WWfaS6XA/M/q0+N9N0Lbuyw5COSryp5F9Q2rOYmjafD3wMh62aTvSDNQovc4exXHNBHZMSRYg3XYwAgs9mmSrbcrFDjpvT+v5AwDIkDh6MA6RC6y7j15AEtuX8gE01Ra+n5xQ3dvOv39nkLWFlB0D7+HGqQFMWDgBt/YZILcfgAbWYKw3wEAAA==",
+  "Body": "H4sIAAAAAAAAAE1RXWuDMBT9L3leS4wkdb651pVCKaVxH2yMkupVQjVKEguu9L/vSh3bQyDcc07OPSdXclL5ue8keK9N5Uh8JWDUqYaCxN72cHsged07DzYbOiAxOaT77WaZyDQjCLXGQO51a6S3k35UWFAeVnhQwCjjMxrOWJRRHlMR88UHSivb9t0GXQiHslBCgQpLBgWDRVGIHChHkh5xsQCB04BHIhAB41SEJVXlI+JNa6p29fQK1uEOyI3mdC4QMKoZvafVZ1EY4LCz7UUXYP+HHePjfT9Bu7sueZPIL7Q7S/0N6ycS8zn9e2BiPW/Td6RZqNB8mr3IY5rI7BgQ7MF5rGACloc0yTa7NQq8Gr0/r+QMAyLA4OjBeUQuqu5H8gCO3L6QCbbRRo0F44b+XnX6+z+lqh2g6J7+ADUoB3LAxA2+sc0kuf0A4Bl34eABAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "340"
+      "341"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:50 GMT"
+      "Fri, 28 Mar 2025 05:06:57 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "634"
+      "754"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/memory.json b/test/e2e/.snapshots/TestFlexClustersFile/memory.json
index ab2d959be9..188ddb6cea 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/memory.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/memory.json
@@ -1 +1 @@
-{"clusterFileName":"cluster-16"}
\ No newline at end of file
+{"clusterFileName":"cluster-831"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_userToDNMapping_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_userToDNMapping_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_userToDNMapping_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_userToDNMapping_1.json
index 42ceb00cb9..fe08c35d4b 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_userToDNMapping_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_userToDNMapping_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJjdXN0b21lclg1MDkiOnt9LCJsZGFwIjp7ImF1dGhlbnRpY2F0aW9uRW5hYmxlZCI6ZmFsc2UsImF1dGhvcml6YXRpb25FbmFibGVkIjpmYWxzZSwiYmluZFVzZXJuYW1lIjoiY249YWRtaW4sZGM9ZXhhbXBsZSxkYz1vcmciLCJob3N0bmFtZSI6ImxvY2FsaG9zdCIsInBvcnQiOjE5NjU3fX0=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/userSecurity/ldap/userToDNMapping",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/userSecurity/ldap/userToDNMapping",
   "Headers": {
     "Content-Length": [
       "167"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:25 GMT"
+      "Fri, 28 Mar 2025 05:15:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "89"
+      "81"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_1.json
deleted file mode 100644
index 959c80e838..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW/aMBD+K5M/F8LLoG2+pUArJt5E0nbrNCEnPsCrY0e2w0Qr/vvOOO2AqdO+tB+Qgu/uued895yfCWUbKjNgPSWXfFVqarmSJHwmWWmsyqcFSGNEjxdr0N4nEabZIuH3H2ck55LnZT6QNBXA0DDTyqpMCRKSZBQ3Fy1yRqwwh+FjxQDN/cF1dDtKyO6MpDR7LIsKhIRLKgzgKUd/CZlV2tGBE7MGymYalqAB6SOggUxJRvXWQWYC2YNOtoUzzQez0bAXxYME6WQeFauMreZyZRDdRSCghT7+MKDVaHVqjXat1U2a3bB9Hn5uPWAo4+Yx5k9wc0XCdqPe8Cf3VOM9vNR1fTsafVvcR/PxoI8hSE5vC5ctsnMwFi9owxlgSWQynQzQYyVUSkXPE45BLMdU0hWweE01Q9zXildalcUQb4B0z+Fzi3XalKW022m26UXWWXYuLxCNH9i7R/Yua6Bd0BSE8d0TXD66z2eyxovEuLW1hQmDIBOqZDUGm3qu5EqxtJ6pPKAFD6gV1ASbVrAnY4K3mARVA0wgGC1q7csOcS0T+z6JJbboQ5IGfrQCjTevNHxRqXnlcZT3KOeh9wcTNZIWZq3s/9D847tzUnSW/tWY/lT6DqH3KiYXddf0ynZ0XO+iQdLczexBjwpamgOVFdye6lJDIXi2XxNxAZkfoH+MHb10icp8P8/o3XQQK4z268DH48iLreWZqSARURrrFpPTG2KPm41KgMPpLHbya6D8IDV3SpQ5VEKPk2jSj+ZOeBLl2FOltCRsoLxpaVWcUbEXFC43lRelk/rfi6XQwDjuhw2cVm4wHvrqlzw27DwvtxRO0XZoA4Hbxh2+R2ntnSPMleZ2S8Jz98fvl4nvbHQfE78rp1Js3+tyfT+rlLfxYhDFyaK5H8snJWH49nCk7oFwPlXwA35+8pFaKdsDbavsw3h+M59Ok69NjED29iWkNx9EyXBy414auqpWG4oLd/J+SN2T5Pf9aT83Xg9z7BA1EG9RkjkCjpKY7H4DX7NuUBkHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/clusters/ldap-395",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "785"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:42 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "75"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_2.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_2.json
deleted file mode 100644
index 14d92da0d4..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW8aORT9Kys/9KWB+aBAMlK0okArVhAiPGm6rarIM3MBNx57ZHumSyL++17PTFJg22r70Eogga/vuV/nHj8SllVMppCNlVzzTamZ5UqS6JGkpbEqXxYgjRFjXmxBN3diYYKQRB8/nZGcS56X+VSyRECGhmutrEqVIBGJ5zS4C8kZscIcui9UBmieTN+MbuYx2Z+RhKX3ZdGCkGjNhAE85XhfQmqVdunAiVkDy641rEEDpo+ABlIlM6Z3DjIVmD3oeFc402p6PZ+NR3QaYzppg4pVUqu53BiHbixzvghPciU3KksizxMZKzq9i37HbNHU8X38dDf/7IB120udDKquBBuFQz8Ynn3DIfhZh/BHDt6fOItLq0t4wUq7parUKVyyDOfwQkMheMoo2EtmBTOdihflQ/gEjZU/FUl19bXOl0ZXB7V+O3rdUuy4hQl+0Tn0w37H73XCQRwMot4wehV+wAgZN/eUP8Db1yTq+V2/ObllGhN8Gvybm/n877vb0WoxnaALTk/vCjeOkV2BscigimeAMydXy6sp3tgIlTAxbiZKQawXTLINZNQVhrjPlNhoVRYzN8PBEF6FWb/HsoQN+kGPnaf9df/iHNH4gX1wZB9krkmCJSBMQ2/B5b37+Ui2yDT021pbGOxWKlSZ1c1pG9VNVe6xgnt1670q9OpkjPe9TLyWoea588RxWtREFmts+G8J6jW752nsvNLwl0rMcx5HcY9iHt7+zYkayQqzVfb/pPn17t5plbNMXi/YZ6XfIXQtc+S864be2o6OuwM0SJY7zh7MqGClOZChgttT4WoXsVaYAtKGQD+gHbtwgcq85jPeDhzEBr0bvWz8kfJiZ3lqWkhElG6fU3D7htiLwG8XcLa8pm79fFw/SMw7JcocWiWk8ehqMlq5xZO4jmNVSksiH9cb9UTRlIl6oVD9VV6UbtX/q7yFhoyjgFZwWrlBf5ioL/LYsG/ycqJwirZHGwiUY3f4K0rr7V3CXGludyQauj+Nvlw1kx3dUtI8Jkspdr+quc0825A39G46ovFdUNPyQUmYfZ8ciXtB3Z3W+QP+/KPx1ErZMWjbRp/R1dvVchm/Dxqpt08us8ncyahlm1bWcLFQj2uCuve6eQxPZ1k1u7DC6TADdIfrmCPYPKZk/y92szl9NggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/clusters/ldap-395",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "886"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:28 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_provider_regions_1.json
deleted file mode 100644
index a169195365..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHLGqlVXKKNIhwO/sIqDIRLtrYalTUlSHyb+98WKqFPa7DE3J/ee5CY5IEaTb4mcrwPaCYiQg3ZKpdLBeMN4Fr6EsK/FPNnycF3b8BiTlGKiGJF438BbwbNU4nYHWo3QbpJwTdq21STdjR3Zr12dIpMKhMSp4HsagsACtpQn8o0mei6EHs8S5SqRQeWCSNdbBBVFQbhDq15JyRZGWexaFaoglhMQEx1xrXodVZEApoUlsAgdl6ehzJg6b4YmUpFkAwH9gXOE7AllZM1genbIgyFERK9BzsmhihISg844D1a+F8xWFjpWb5iIMPkINUqghf+Y6W+1nClM1PNWPX80m3qDYit/vhqNp7N+KfVM6zlU6HWBmiWQqfyFKywaeAb98SZmUDCez/rlnbwjC3d7R7ZKyLxZRp5XsszzSpp7Gp2SIVXoN/TN7oLmTGq+m1D6Xv2HKvT/GJj56wdb/sTuWmAbk53Cg/u8FVxe41Y9H14+2lPSRZCHFFeE5X8xcqzjL9yOr/cUBgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "414"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:41 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "133"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_ldap-704_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_ldap-704_1.json
new file mode 100644
index 0000000000..d90ca7da77
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_ldap-704_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/LiSEAlW+pcAqJn6JpO3WaUImOcCrY0e2w0Qr/ved47QDplX70n5ACrm7d8++ey/PhGY7KlLI+lKs2aZU1DApSPhM0lIbmc8KEFrzPiu2oFxOwnUrIOH3HxckZ4LlZT4UdMUhw8BcSSNTyUlIknHcWgbkghiuj8snMgMMD4afo9txQg4XZEXTx7KoQUi4plwDvmWYLyA1Ulk6cBZWQLO5gjUoQPoIqCGVIqNqbyFTjuxBJfvChhbD+XjUj+JhgnRSh4qnjI1iYqMR3VYgoIEB/rAg8INOw283gqvE74R+L2x1HrA0Y/oxZk9wc03Ctt/03Zt7qvAeXs71+XY8/ra8jxaT4QBLkJzaF7ZbZBagDV7QjmWARyLT2XSIGRsuV5T3HeEY+HpCBd1AFm+pyhD39cQbJctihDdAuj3oBnDl9/xusE4vr4C2L3GEFNHYUbx9El93uxjndAVcu+lxJh7t4zPZ4kVi3daYQoeel3JZZo0Mds1cio3MVs1U5h4tmEcNp9rbBV5FRnv/YuLVA9Aez2jR6PmXxI6MV3PiaxzRhzT13Gp5Cm9eKvgiV/qVx0nfk57H2R9MVAta6K00/0PzT+7BStFGBtcT+lOqO4SuVEyumj55jZ28btptEDS3O3s0o4KW+khlBTPnulRQcJZWNhEXkLoFemPtOlWjMq/2GbNbFmKD1c4OXD2uPN8bluoaEhGFNtaYrN4Qe9LyawGOZvPYys9H+cFK30le5lALPU6i6SBaWOEJlGNflsKQ0Ed509LIOKW8EhSam8yL0kr9b2MpFGQM/WEH5yfXWA8D+UucBg6OlzWFc7QDxoCj29iX73G09sESZlIxsydhz/5x/jJ1k43uY+K8cib4/r0u182zbnkbL4dRnCxb1Vo+SQGjN5YDiMupix/w8ZOrVFKaPihTdx/Fi5vFbJZ8bWEFsjcvJf3FMEpG0xv7paGb2tpQXOjJ1ZLaT5Lz+/N57pweFjghqiHeoyRzBBwnMTn8BoK/7jYZBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/clusters/ldap-704",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "780"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:16 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "70"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_ldap-704_2.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_ldap-704_2.json
new file mode 100644
index 0000000000..100b8e38cf
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_ldap-704_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW/aSBT9K9U89GUD/iCByFJUUaAVFYSIcZpuV1U02BczzXjGmhlT0Yj/vnc8TgpsN9p9aCWQwPf73nOOHwnLt0xmkI+UXPOi1sxyJUnySLLaWFUuKpDGiBGvNqC9TypMFJPkry9npOSSl3U5kWwlIEfDjVZWZUqQhKQzGt3H5IxYYQ7D5yoHNI8n74a3s5Tsz8iKZQ911SYhyZoJA/iUo7+EzCrt2oETswaW32hYgwZsHxMayJTMmd65lJnA7kGnu8qZlpOb2XQ0pJMU28l8VpySWs1lYVx2Y5mLxfSkVLJQ+SoJApGzqjMIzztmg6ZOGOKnW+z6K9VtnTo5bLsSbBIPwmhw9pOA6P8GxC8FBG/wFldW1/Ca1XZDVa0zuGI53uG1hkrwjFGwV8wKZjp8o+uBekqNkz8NSfX2x5x/GL09mPXn1ZuV4sYtjPGLwXEYX3TCXie+TMOLJBwk0cVnrJBz80D5d3j/liS9sBv6J3dMY4NPh393O5v9eX83XM4nYwzB6+ld5c4xtEswFhG05Tngzcn14nqCHoVQKyZG/qIUxHrOJCsgp24wzPsMiUKrupq6G/YH0I/hMhyE/XidnV8C650jxhlm4wf23pF93e+jXbAVCOPhLbh8cD8fyQaRhnEbayuD28qEqvNmOe2iupkqA1bxoFl9sI2DphkT/FsnQYtQ87x54jAtGiCLNS78txQNPPcCjZtXGj6olXnu46juUc1D79/cqJGsMhtl/0ubP3z3TqucZfx2zr4q/RFTNzJHLruOGa3t6HHXoUGy0mH24EYVq82BDFXcngpXS8RGYSrIPIBegN1FU6guGzyjd+RSFBjt9dLHI+TFzvLMtCkxo3R8zsDxDXPPo7Al4HRxQx39QqQfrMxHJeoSWiWk6fB6PFw64kmk40jV0pIkRHqjniiaMdEQCtVflVXtqP5P5a005BwFdAunkxuMh7H6Jo8Ne9+XE4XTbHu0gUA5dg9/xWi9vWuYK83tjiQD98fry7W/7PCOEv8yWUix+1XL9fdsS97S+8mQpvdRA8vvSsL0BXAA8T5t8Gf8+cpHaqXsCLRtq0/p8v1ysUg/RV7q7VPIdDxzMmpZ0coaEgv1uAGoe1/7l+HpLbeeC0u8DjNAd0jHEpPNUkr2fwNIxnTXNggAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/clusters/ldap-704",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "880"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:31 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "58"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_provider_regions_1.json
index 0527fc31ed..03bfa36a12 100644
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeh2FMop0OPCGVRwMkdSealjalCT1YeJ/X6wUdUqbPebkyzlfcpIcEaPJt0T21xHtBUTIRnulUmljvGU8C19CODRinux4GDS2PMYkpZgoRiQ+tPBO8CyVuNeHTivsBiQMSK9rtcnrthv1g0inyKQCIXEq+IGGILCAHeWJfKOJngthwLNEOUpkUCsQ6bgrv6YoCGdsNWsp2cEkix2rRhXEcgZipiOO1WyiOhLAtLAEFqHT+jyUGVOXzdBEKpJswac/cImQA6GMBAzmF4c8GEJE9Bpknx3qKCEx6IxLf+O5/mJjoVP9hokIk49QqwJaeY+Z/lbLmdJEA3cz8CaLuTsqt/KWm8l0vhhWUs+0nkOlXgXUroBM5QuutKjvGvTHnZlB/nS5GFZ38o4s3e0d2akg82YZeV7JKs8rae5pdEqGVKnf2DO7C5ozqfluQul79R+q1P9jZOavH2z1E7trQdeY7Jce3Oet4Poat5r5sPhoz0lXfh5SXBGW/8XItk6/A7p9uBQGAAA=",
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmVadSKKNIhwO/sIqDIRLbWw1Lm5KkPkz874sVUae02WNuTu49yU1yQIym3xI5Xwe0ExAjB+2UyqSDcch4Hr1EsG8kPN3yaNMIeYJJRjFRjEi8b+Kt4HkmcacLnSb0rK7VacZhuwek1Q4hIjpFLhUIiTPB9zQCgQVsKU/lG031XAR9nqfKVSKH2gWRrrcMaoqCcEe2VcvIFsZ54to1qiCRUxBTHXFty0J1JIBpYQksRsfVaShzps6boalUJA0hoD9wjpA9oYxsGMzODkUwgpjoNcg5OdRRShLQGRfB2veC+dpGx/oNExMmH6FmBbT0HzP9rVYwpYn63rrvj+czb1hu5S/W48lsPqiknmk9h0q9LlCrAjKVv3ClRQPPoD/e1AwKJov5oLqTd2Tpbu/IdgVZNMvI80pWeV5Jc0+jUzKkSv1Gvtld0JxJzXcTSt+r/1Cl/h9DM3/9YKuf2F0LXo3JbunBfd4Krq5x2yqGl4/2lHQZFCHFFWHFX4wc+/gL6cUwwhQGAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:49 GMT"
+      "Fri, 28 Mar 2025 05:07:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "75"
+      "51"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_1.json
index 5f22368508..68e218273f 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_1.json
@@ -2,7 +2,7 @@
   "Body": "H4sIAAAAAAAAAG2OTUvEMBCG/8ucFENZD6tsoaBoWBZsFVFYkD1Mk7EN5It8gFjy303Vk3h7Z96Zh2cBkWNyhsJxu9lBuxQGWqKvCTCnmWxSApNyllscNUlo31FHYt+tC+rz33JUVr5GChYNQQvCdiiNskyKjj7QeE1rdGECBrOL6fdOO4F6nevau5Cgvdxdba8Z5Mp6cfdDj94rO0H7toDBJOb6dNZcnN/wYX8YOH8+DPuGH2/7pwfe3D32lRPzGJNKedX8UVk2hbnckZ2UJQqV98dLOAPlVMoXeJ4VqB0BAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/userSecurity",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:34 GMT"
+      "Fri, 28 Mar 2025 05:15:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "52"
+      "38"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_67e6307358616125063f2678_1.json
similarity index 59%
rename from test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_67e6307358616125063f2678_1.json
index 21b0e8d4c6..b239ed9427 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_67e6307358616125063f2678_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQzU7DMBCE38XnUqspiZtIvYFQLxUIOKEeNvY6sXBs45+IUOXdcQDBhd52R9/ujOZMOm+TOwjSkIrhdSHKLYgWqnKzhR0vZVnvyIpoZV4DaV7OpPcoM9vH6EJDKdc2iSuB43qwprOiXXM7UHCKQtQQ6FjQL4NAL32nKaB/RJ68ihPVAhwd0Ss5fV/Ioq4ZawvGKsmAMWSY83jUOURALcl8Wta3hCGS5kwgxf7jIaGfnnBwGiJmMF+0yojn7GRgWBRu9iAGZVaC7/EdMonLaH2X2d6G+MNpy0Eve5ad9dliU1clm389/5r7P2mIEFOujtzfHm8Ox7ssjaCVgKisWSo9zZ99Xp8OhAEAAA==",
+  "Body": "H4sIAAAAAAAAAHWQS0/DMBCE/4vPpc6jcUKk3opQLxUIOKEetvYmsXDs4EdEiPLfcSrUW2+7o293RjOT1powHAWpCSuRZVglZcKyhu8qhHzHUQDZECX1lyP150w6i01kO+8HV1PKlQniQeC47Y1ujbhsuekpDJKCV+DomNGrgaP3vtPg0L4hD1b6iSoBAx3Ryma6XuRJmRcVS1maFQnLm4yVVcxjUcUQDlVDlvO6fgd0ntQzgeC739eAdnrHflDgMYLx4iK1+IhOGvpV4XoPopd6I/gefyCSuI7GtpHtjPP/nDIc1LpHeTA2WqSPrCiXm+etuTtJnQcfYnXk5el0OJ6eozSCkgK8NHqt9Lz8AVV9ehSEAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity/ldap/verify/67e42f29977b2776f7a77e7e",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/userSecurity/ldap/verify/67e6307358616125063f2678",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "277"
+      "279"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:29 GMT"
+      "Fri, 28 Mar 2025 05:15:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "72"
+      "34"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_2.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_67e6307358616125063f2678_2.json
similarity index 58%
rename from test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_2.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_67e6307358616125063f2678_2.json
index 2840126cf8..bb05ac396d 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_2.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_67e6307358616125063f2678_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQX0vDMBTFv0ue58I626yFPcicMJCJOJ/Eh9vkdg2mScyfYh377qZOHAN9yz353ZyTcyB7Z6LdCFKRguF1JvI5iBqKfDaHBc+bvFyQCVFSv3lSvRxI67BJbBuC9RWlXJkorgT2087ovRH1lJuOgpUUggJP+4x+G3j63+s0enRPyKOTYaBKgKU9OtkMp40mK0vG6oyxomHAGDJMeRyqFMKjasjxdRzfI/pAqgOBGNrPx4hu2GFnFQRMYNqopRbPyUlDNypcL0F0Uk8EX+IHJBLHo3H7xLbGhx9OGQ5qnJNsjUsWs7LI2fHX89zc30l9gBBTdeTuZnO/vk1KD0oKCNLoU6MXxMX9brBjhtXDdrte7dJPj1/nLYBhrwEAAA==",
+  "Body": "H4sIAAAAAAAAAHWQzU7DMBCE38XnUqdJ64RIPaBSpEqoCFFOiMPW3jQWjm38ExGqvjsOoEo99OYdf+sZz5EcnIl2I0hNWIksxyorM5Y3fF4hFHOOAsiEKKk/PKnfjqR12CS2DcH6mlKuTBQ3AvtpZ/TBiP2Um46ClRSCAk/7nP4aeHrtdRo9uhfk0ckwUCXA0h6dbIbfjSIri0XFZmyWLzJWNDkrq5THoUohPKqGnN7H8TOiD6Q+Eoih/X6O6IYddlZBwASmjb3U4jU5aehGhesliE7qieBL/IJE4ng07pDY1vjwzynDQY1zkq1xyWJ2yxbl6ex5bu5KUh8gxFQdebjbPK7vk9KDkgKCNPqv0Qvi4n432DHD6mm7Xa926aenHwUZEu+vAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity/ldap/verify/67e42f29977b2776f7a77e7e",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/userSecurity/ldap/verify/67e6307358616125063f2678",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "295"
+      "297"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:33 GMT"
+      "Fri, 28 Mar 2025 05:15:35 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "58"
+      "43"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 9fc885d02a..722626878b 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:41 GMT"
+      "Fri, 28 Mar 2025 05:07:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_1.json
index 7f4fa2a880..0fc52a0d51 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJjdXN0b21lclg1MDkiOnt9LCJsZGFwIjp7ImF1dGhlbnRpY2F0aW9uRW5hYmxlZCI6ZmFsc2UsImF1dGhvcml6YXRpb25FbmFibGVkIjpmYWxzZSwiYmluZFVzZXJuYW1lIjoiY249YWRtaW4sZGM9ZXhhbXBsZSxkYz1vcmciLCJob3N0bmFtZSI6ImxvY2FsaG9zdCIsInBvcnQiOjE5NjU3LCJ1c2VyVG9ETk1hcHBpbmciOlt7Im1hdGNoIjoiKC4rKUBFTkdJTkVFUklORy5FWEFNUExFLkNPTSIsInN1YnN0aXR1dGlvbiI6ImNuPXswfSxvdT1lbmdpbmVlcmluZyxkYz1leGFtcGxlLGRjPWNvbSJ9XX19",
   "Status": 202,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/userSecurity",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/userSecurity",
   "Headers": {
     "Content-Length": [
       "285"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:25 GMT"
+      "Fri, 28 Mar 2025 05:15:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "88"
+      "97"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_1.json
index 35347deadd..0a6eecb222 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGDAENZO3dulVYfDd4BVg5Ft0iHi30sUNS1LxcJ8T++edLorU2b2gdyTncfA6iRiyhEEQlYzkYgiTrJYyJdU1llZ5+kbi5i+zWRJucAiA2xAFmkGlSra4lytc6PHT8/q9yvrHbUr24cw+ZpzZeyMMdLlNNixs9iclB04TJpDMOD5RfDO2Xny/B+7I7MqPZmWLdEBK7iyYwA9kvOPbRv7xvwHPqjmfp5dLT/oMSUIARrw9Or35Wz5Y5om2tdy5w5qcFaR97Sr48Ee0/LV60BG+7Cj5ZddPiI2wkArbhCmmATF51KuDuu659u3F9QiyEpA1gpCQSWiVEg5W74BAe+s8EEEAAA=",
+  "Body": "H4sIAAAAAAAAALWTPU/DMBBA/8vNSe06n/LKxA4LiOFqX9IIx45spwxV/jupKgpZUBbP9/TuSae7gjJziOSf3GwjSJ6B8oSRNEgQXFQ5L3LRvvBK8kYeyzfIYLjN6oZqQS1veC06VbaERalI4zo3g/0MIN+vcPbUrew5xilIxpRxs841XQ6js73Tp4NyI8NpYBgNBnYRrPdungL7x+7JrMpApoMlS7CCKWcjDpZ8eGzb2DfmP3Cimvt5drX8oGlKNEY8YaDXsC9ny6dpmmhfy51L1OCdohBoV8eDTdPydR4imSHEHS2/7PKRgcWRVtxonHISlB/banU43z/fvr2iTmPdCiw6QVpQo3WtNJWwfAPsq9anQQQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "281"
+      "280"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:39 GMT"
+      "Fri, 28 Mar 2025 05:07:12 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2465"
+      "2419"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_1.json
deleted file mode 100644
index 40f84c3bcb..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW/aMBD+K5M/F8LLoG2+pUArJt5E0nbrNCEnPsCrY0e2w0Qr/vvOOO2AqdO+tB+Qgu/uued895yfCWUbKjNgPSWXfFVqarmSJHwmWWmsyqcFSGNEjxdr0N4nEabZIuH3H2ck55LnZT6QNBXA0DDTyqpMCRKSZBQ3Fy1yRqwwh+FjxQDN/cF1dDtKyO6MpDR7LIsKhIRLKgzgKUd/CZlV2tGBE7MGymYalqAB6SOggUxJRvXWQWYC2YNOtoUzzQez0bAXxYME6WQeFauMreZyZRDdRSCghT7+MKDVaHVqjXat1U2a3bB9Hn5uPWAo4+Yx5k9wc0XCdqPe8Cf3VOM9vNR1fTsafVvcR/PxoI8hSE5vC5ctsnMwFi9owxlgSWQynQzQYyVUSkXPE45BLMdU0hWweE01Q9zXildalcUQb4B0z+Fzi3XalKW022m26UXWWXYuLxCNH9i7R/Yua6Bd0BSE8d0TXD66z2eyxovEuLW1hQmDIBOqZDUGm3qu5EqxtJ6pPKAFD6gV1ASbVrAnY4K3mARVA0wgGC1q7csOcS0T+z6JJbboQ5IGfrQCjTevNHxRqXnlcZT3KOeh9wcTNZIWZq3s/9D847tzUnSW/tWY/lT6DqH3KiYXddf0ynZ0XO+iQdLczexBjwpamgOVFdye6lJDIXi2XxNxAZkfoH+MHb10icp8P8/o3XQQK4z268DH48iLreWZqSARURrrFpPTG2KPm41KgMPpLHbya6D8IDV3SpQ5VEKPk2jSj+ZOeBLl2FOltCRsoLxpaVWcUbEXFC43lRelk/rfi6XQwDjuhw2cVm4wHvrqlzw27DwvtxRO0XZoA4Hbxh2+R2ntnSPMleZ2S8Jz98fvl4nvbHQfE78rp1Js3+tyfT+rlLfxYhDFyaK5H8snJWH49nCk7oFwPlXwA35+8pFaKdsDbavsw3h+M59Ok69NjED29iWkNx9EyXBy414acJt4P5ruIfJb/rSLG6+COfaFGoi3KMQcYUZJTHa/AWWJedkPBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "780"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:41 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "608"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_1.json
new file mode 100644
index 0000000000..85968c5606
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e62e807062fc48ea34ceda_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/LiRAgSrfUmAVE7+UpO3WaUImOcCrY0e2w0Qr/ved47QDplX70n5ACrl775599y7PhGY7KlLIBlKs2aZU1DApSPBM0lIbmc8LEFrzASu2oFxOwnWrTYLvPy5IzgTLy3wk6IpDhoGFkkamkpOAJJO4tWyTC2K4PoZPZQYYHo4+h7eThBwuyIqmj2VRk5BgTbkGfMswX0BqpLJy4CysgGYLBWtQgPKRUEMqRUbV3lKmHNWDSvaFDUWjxWQ8CONRgnJSx4qnjI1iYqOR3SKQ0MAQfwho++1uw+802leJ3w38ftDqPiA0Y/oxZk9wc02Cjt/03Zt7qvAeXs71+XYy+ba8D6PpaIgQFKf2ha0Wmgi0wQvasQzwSGQ2n40wY8PlivKBExwDX0+poBvI4i1VGfK+nnijZFmM8QZIrw+9Nlz5fb/XXqeXV0A7l9hCimzsKN45ia97PYxzugKuXfc4E4/28Zls8SIRtzWm0IHnpVyWWSODXTOXYiOzVTOVuUcL5lHDqfZ2ba8So71/KfHqBmiPZ7Ro9P1LYlvGqz7xNbboQ4p6brQ8hTcvFXyRK/2q46TuSc3j7A8WqgUt9Faa/5H5J/dgrWgjw+sp/SnVHVJXLiZXTZ+8xk5eN+00CJrbmT3qUUFLfeSygplzXyooOEurNREXkLoBemPsulWhMq/mGbNblmKDaLcOHB5Hnu8NS3VNiYxCG7uYrN+Qe9ryawOO54vY2s9H+8FK30le5lAbPU7C2TCMrPEE2nEgS2FI4KO9aWlknFJeGQqXm8yL0lr978VSKMgY7ocdnJ9cIx6G8pc4DRycLrsUztkOGAOO28a+fI+jdQ5WMJOKmT0J+vaP2y8z19nwPiZuV84F37/X5bp+1iVv4+UojJNlqxrLJylg/MZwAHE5NfgBHz85pJLSDECZuvo4jm6i+Tz52kIEqjcvkEE0CpPx7MZ+acBu4mo07YfIbfnzLu6cCyLsC9UQ79GIOdJMkpgcfgNL3wtXDwcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "775"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:15 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "565"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_1.json
index bc80345258..906dee79ae 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e62e807062fc48ea34ceda_userSecurity_ldap_verify_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQzU7DMBCE38XnUqspiZtIvYFQLxUIOKEeNvY6sXBs45+IUOXdcQDBhd52R9/ujOZMOm+TOwjSkIrhdSHKLYgWqnKzhR0vZVnvyIpoZV4DaV7OpPcoM9vH6EJDKdc2iSuB43qwprOiXXM7UHCKQtQQ6FjQL4NAL32nKaB/RJ68ihPVAhwd0Ss5fV/Ioq4ZawvGKsmAMWSY83jUOURALcl8Wta3hCGS5kwgxf7jIaGfnnBwGiJmMF+0yojn7GRgWBRu9iAGZVaC7/EdMonLaH2X2d6G+MNpy0Eve5ad9dliU1clm389/5r7P2mIEFOujtzfHm8Ox7ssjaCVgKisWSo9zZ99Xp8OhAEAAA==",
+  "Body": "H4sIAAAAAAAAAHWQS0/DMBCE/4vPpc6jcUKk3opQLxUIOKEetvYmsXDs4EdEiPLfcSrUW2+7o293RjOT1powHAWpCSuRZVglZcKyhu8qhHzHUQDZECX1lyP150w6i01kO+8HV1PKlQniQeC47Y1ujbhsuekpDJKCV+DomNGrgaP3vtPg0L4hD1b6iSoBAx3Ryma6XuRJmRcVS1maFQnLm4yVVcxjUcUQDlVDlvO6fgd0ntQzgeC739eAdnrHflDgMYLx4iK1+IhOGvpV4XoPopd6I/gefyCSuI7GtpHtjPP/nDIc1LpHeTA2WqSPrCiXm+etuTtJnQcfYnXk5el0OJ6eozSCkgK8NHqt9Lz8AVV9ehSEAQAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity/ldap/verify",
+  "Path": "/api/atlas/v2/groups/67e62e807062fc48ea34ceda/userSecurity/ldap/verify",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "277"
+      "279"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:29 GMT"
+      "Fri, 28 Mar 2025 05:15:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "307"
+      "116"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/memory.json b/test/e2e/.snapshots/TestLDAPWithFlags/memory.json
index 38cec764f1..955bad7d57 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/memory.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/memory.json
@@ -1 +1 @@
-{"ldapGenerateClusterName":"ldap-395"}
\ No newline at end of file
+{"ldapGenerateClusterName":"ldap-704"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_userToDNMapping_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_ldap_userToDNMapping_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_userToDNMapping_1.json
rename to test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_ldap_userToDNMapping_1.json
index 34d54294cb..4fb35ec6e1 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_userToDNMapping_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_ldap_userToDNMapping_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJjdXN0b21lclg1MDkiOnt9LCJsZGFwIjp7ImF1dGhlbnRpY2F0aW9uRW5hYmxlZCI6ZmFsc2UsImF1dGhvcml6YXRpb25FbmFibGVkIjpmYWxzZSwiYmluZFVzZXJuYW1lIjoiY249YWRtaW4sZGM9ZXhhbXBsZSxkYz1vcmciLCJob3N0bmFtZSI6ImxvY2FsaG9zdCIsInBvcnQiOjE5NjU3fX0=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity/ldap/userToDNMapping",
+  "Path": "/api/atlas/v2/groups/67e630797062fc48ea34e810/userSecurity/ldap/userToDNMapping",
   "Headers": {
     "Content-Length": [
       "167"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:34 GMT"
+      "Fri, 28 Mar 2025 05:23:37 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "84"
+      "90"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_1.json
deleted file mode 100644
index 5f71b1ff19..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227iMBD9lZWfWxICJd28pUArVlwqkra7Xa2QSSbgrWNHtsOKVvz7jnF6gVWlfWkfkEJm5syxZ87JE6H5hooM8r4UBVvVihomBYmeSFZrI8tZBUJr3mfVGpTLSbluByT6+euElEywsi6Hgi455Bi4VtLITHISkXSctBcBOSGG67flE5kDhgfDy/hmnJLdCVnS7KGuGhASFZRrwLcM8wVkRipLB47CCmh+raAABUgfATVkUuRUbS1kxpE9qHRb2dB8eD0e9eNkmCKdzKHiKROjmFhpRLcVCGhggD8sCPzg7NTvnAa9tN2LumdRJ7zH0pzph4Q9wtUFiTp+y3dv7qjCe3g+1+XNePxjcRfPJ8MBliA5ta1st9jMQRu8oA3LAY9EprPpEDNWXC4p7zvCCfBiQgVdQZ6sqcoR9+XEKyXraoQ3QHohdIMigK9huAzCsFeENAwhO0c09hrvtA/iRbfAOKdL4NpNjzPxYB+fyBovEuvWxlQ68ryMyzo/zWHTKqVYyXzZymTp0Yp51HCqvU3g7clo7z0mXjMA7fGcVqfnIbET4/sx8QIn9Bk9PbdYnsJ7lwq+yaV+oXHQ9qDl2+zP5akFrfRamv9h+Zq7szq0kcHFhP6W6haR9xIm5y2fvMQOXrd6GBC0tAv7OqCK1vqNwipmjjWpoOIs21tEUkHmluftyvmHK9fJbZ+63O8yZrctxAqrnRW4elx3vjUs0w0kIgptrClZrSH2pO034hvNrhMrPR+lB0t9K3ldQiPyJI2ng3huRSdQin1ZC0MiH6VNayOTjPK9mNDYZFnVVub/mkqlIGfoDRs4PrnGehjIP+IwsHO8rCEco+0wBhydxr78iKN1dpYwk4qZLYlC+8d5y9QNNr5LiPPJmeDbj7pcN8+m5U2yGMZJumjvt/JRChi9vxzdM+JymuJ7fPziKpWUpg/KNN1HyfxqPpul39tYgezNc0l/PozT0fTKfmXoqrE1lBb68X5J7efIef3xPDdODnOcENWQbFGQJQKO04Ts/gINMzNTFQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/clusters/ldap-87",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "787"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:37 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "70"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_2.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_2.json
deleted file mode 100644
index dff6f2757f..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW8aRxT9K9U85KWG/cBm3ZWsigCJqMBY7DpuU1XWMHuBqWdnVjOzRNjiv+fOzhIMaar2IZFAgr33nvt5zr4QWmypZFAMlVzxda2p5UqS9IWw2lhVziuQxoghrzagvU8uTBST9M+/LkjJJS/rcizpUkCBhjutrGJKkJTk0yx6jMkFscK8Dp+pAtA8Gr8b3E9zsr8gS8qe6qoFIemKCgP4lKO/BGaVduXAmVkDLe40rEADlo+ABpiSBdU7B8kEVg8631XOtBjfTSfDQTbOsRzmUbHLzGou18ahG0tdLMKTUsm1KpZpEIiCVp3rpGM2aOmEIX66VcWeP3Vbn04B264Em8ZJGCUXX/tH/9M//jf/4FdcxI3VNbyhtd1kqtYMbmiBS3ijoRKc0QzsDbWCmg4tTS+hB2hs+9BhprfHJn82ents9J+TN+PEaVsY4Rdj4zC+6oS9TtzPo356eZX2ko+YoODmKePP8P4tSXthN/RPHqjG+g5Lf3c/nf7x+DBYzMYjDMHN6V3lVjGwCzAWr2fLC8B9k9v57Rg91kItqRj6bWYgVjMq6RqKzPWFuF/OYa1VXU3c/voJXMarGH5JkmWcJP1VQpME2DWi8aO9F53YV5crtAu6BGH8aQsun9zPF7LBK8O4jbWVwWExoeqiGU47qC5TZUArHjSTD7Zx0BRjgm9VErTXaQ6DJ+6cRXPDYoXz/hE5A8+6QOPclYbf1NJ8KeMk7UnK194/tk4jaWU2yv6XKo++eydSzjJ6O6N/K/0BkRt9I9ddx4rWdvK420eDpKU72OOCKlqbV/JTcXsuWC0HG2WpgPnjeX1y4enJ9QqXpy6bW0bvyEGsMdrrpI/Hcxc7y5lpIRFROiozcFxD7FkUtuSbzO8yR70QqQdL80GJuoRWAbN8cDsaLBzpJFJxqGppSRoitVFKVMaoaMiEqq/KqnY0/1pxKw0FR+HcwnnnBuNhpD7JU8Pe1+UE4RxtjzYQKMPu4fdorbd3BXOlud2RNHF/vLbc+sUOHjLiXyJzKXbfa7h+n23K++xxPMjyx6i5ymclYfLt47i8It6nDf6IP3/ykVopOwRt2+yTbPF+MZ/nv0de5e0hZDKaOgm1dN1KGtIKtbg5UPee9i/B811uPRUWuB1qINshGUsEm+YZ2X8G+1afYi4IAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/clusters/ldap-87",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "887"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:54:25 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "74"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_ldap-311_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_ldap-311_1.json
new file mode 100644
index 0000000000..63fd25d78b
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_ldap-311_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXWLL6s3xXYDF74EltJsUywCWhzb3FCkQFJeuIH/fYei2jpebNGX9sGArJk5c8iZc/RKKDtQWQIbK7nlu0ZTy5Uk6SspG2NVtapBGiPGvN6D9jmFMFFM0s9/XZGKS1411VTSjQCGgXutrCqVICkp5nn0HJMrYoU5L18oBhieTN9nD/OCnK7IhpYvTd2BkHRLhQF8yzFfQmmVdnTgIqyBsnsNW9CA9BHQQKkko/roIEuB7EEXx9qF1tP7+Wyc5dMC6ZQeFU+ZW83lziC6q0BACxP8YUEcxv3rMLmOR0XYT6N+ehM9YSnj5iXnX+DulqRJ2Av9m0eq8R6+nuv9w3z+6fkxWy+mEyxBcvpYu26ZXYOxeEEHzgCPRJar5RQzdkJtqBh7wjmI7YJKugOW76lmiPvtxDutmnqGN0AGQxgk4fCPYTiIt+XNCGhyA6MoRDR+Fmf90SAaRHE/HCTbeJgwjAu6AWH89ASXL+7xlezxIrFub21t0iAohWrYNYNDr1Jyp9imV6oqoDUPqBXUBIc4aMmY4P+YBN0ATCAYra+TKCJuZKKdk9jiiH5L08CvVqDx5pWGD2pjvvF40/dNz/Ps30zUSFqbvbI/Q/N77slJ0UUmtwv6t9IfEbpVMRn13FJ0sTevewMMSFq5nT2bUU0bc6aymttLXWqoBS9bm8hrKP0C/WDt4o1r1FTtPmN25CB2WO3twNfjyouj5aXpIBFRGuuMyekNsRftdju5zVb3uZNfiPKDjfmoRFNBJ/S8yJaTbO2EJ1GOY9VIS9IQ5U0bq/KSilZQaG6qqhsn9f8aS62BcfSHA1ye3GA9TNQ/8m3g5Hk5U7hEO2EMBLqNe/krjpacHGGuNLdHkg7dH+8vSz/Z7DEn3itXUhx/1eX6eXYtH/LnaZYXz1G7ll+UhNkPPCkhPqcrfsLHd75SK2XHoG3XfZav79arVfGn21Jkb7+WjNfTrJgt79yXhu46a0NxoSe3S+o+Sd7vL+d58HpY44SogfyIkqwQcF7k5PQvT2IN5hkHAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e630797062fc48ea34e810/clusters/ldap-311",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "794"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:41 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "57"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_ldap-311_2.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_ldap-311_2.json
new file mode 100644
index 0000000000..cdcdea4675
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_ldap-311_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VW2/bNhT+KwMf+rLYusWXCQgG13YLD3YcWEqzdRgCSjq2uVCkSlIa3MD/fYeikjpeF2wPLWADts79nO/79Eho0VCRQzGVYst2taKGSUHiR5LX2shyXYHQmk9ZtQflfFKug5DEv/9xQUomWFmXc0EzDgUabpQ0MpecxCRdJsF9SC6I4fo0fCULQPNs/m5yu0zJ8YJkNH+oqy4JibeUa8CnDP0F5EYq2w6cmRXQ4kbBFhRg+5hQQy5FQdXBpsw5dg8qPVTWtJnfLBfTSTJPsZ3cZcUpE6OY2GmbXRtqYzE9KaXYySKLPY8XtOpFQdDTezT1fB8//UZ+Ck2/c+oV0PQFmDgc+cHo4isBwf8NCF8L8H7GW1wZVcMbWpt9ImuVwxUt8A5vFFSc5TQBc0UNp7rXHEKd7Z9S4+RPQyaq+TLnj1o1J7N+vXq7Uty4gRl+MTj0w0HPj3rhOPUHcTCIL4OPWKFg+iFhn+H9WxJHft93T+6owgafDv/udrn87f5uslnNZxiC11OHyp5jYjagDSKoYQXgzcn1+nqOHjsuM8qn7qIJ8O2KCrqDIrGDYd5nSOyUrKuFveFwBMPIH/008ofhNr8cA40uYRzYJbATezEYD4NhEA78YbQNR1GBdk4z4NrBmzPxYH8+kj0iDeP2xlQat5VzWRftcrpF9XNZerRiXrt6rwm9thnt/VsnXodQ/bx5YjHNWyDzLS78uxT1HPc8hZuXCn6RmX7u40XdFzVPvb9zo1rQSu+l+S9tfvE9Wq2yltnbFf1Tqg+YupU5Mu5bUHS2F4/7QzQIWlrMntyoorU+kaGKmXPh6ojYKkwFuQPQK7ALM1uoLls8o3dgU+ww2umli0fI84Nhue5SYkZh+ZyD5RvmXrXotnRbrG8SSz8f6QeZ/iB5XUKnhEk6uZ5NNpZ4Auk4lbUwJPaR3qgnMskpbwmF6i/LqrZU/6fyVgoKhgLawPnkGuNhJv8SLw1H15cVhfNsR7QBRzm2D7/FaNHRNsykYuZA4pH94/Tl2l12cpcQ9zJZC374Vst19+xK3ib380mS3gctLD9LAYtXNCkizqcL/og/f3CRSkozBWW66otk836zXqe/Bk7qzVPIYra0MmrorpM1JBbqcQtQ+752L8PzWzaOCxu8DtWQHJCOJSZbpgk5/g2ySVRXNggAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e630797062fc48ea34e810/clusters/ldap-311",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "892"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:23:36 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "59"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_provider_regions_1.json
index ce8032ec1b..4a265f60a8 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUUUvDMBCA/0se+jTNWqfRQpEyKgo6x9oxQWRk67ULpk1J0j0o++9mHWObkzY+5vLl7ksuyTfirPxUyH//RisJGfLRSutK+RgvuajTixTWl4Uoc5EuLpeiwLRimGpOFV57OJeirhS+ITDwMg/uCFl4hNxkhBICy1uTolYapMKVFGuWgsQSciZKdc9KM5fCUNSlDrSswdkjKghnsaMZyODF7TsVzWFUF4HrMA2FGoMcm0jg9vuohyRwI6yAZ2jzsR2qmuvdZlipNC2XELMv2EXomjJOFxwmO4cmmEJGzRrkbx16qKQFmIzTeB6FcTJ30aZ3xGSUq3PI64Bm0Xmm39UapjXRMJwPo1EyCZ/braLpfPQ6SR47qb+0/oZavfbQVQdkK7/nWovGoUV/wrEdFL9Ok8fuTp6Qrbs9IQcdZNMsK88D2eV5IO09rU7Jkmr1e4ns7oLhbGo+2FDmXv2HavV/erbzNw+2+4mdtODamiStB/d2LPhxiLv9Zrj/aLdJZ3ET0kJT3vzFyHc3P/25Lq4UBgAA",
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmVadboYwiHQ78wlYcDJFobzUsbUqS+jDxvy9WRJ3SZo+5Obn3JDfJHjGafkvkfO3RVkCMHLRVKpMOxmvG8+gpgl0j4emGR6vGmieYZBQTxYjEuybeCJ5nEne60GlZ3deu1WnG6/YLkFYbXmxLp8ilAiFxJviORiCwgA3lqXyjqZ6LoMfzVLlK5FA7I9L15kFNURDu0LZqGdnAKE9cu0YVJHICYqIjrm1ZqI4EMC0sgcXosDgOZc7UaTM0lYqkawjoD5wiZEcoIysG05NDEYwgJnoNco4OdZSSBHTGWbD0vSBc2uhQv2JiwuQ91KyA5v59pr/VCqY0Uc9b9vxROPUG5Vb+bDkaT8N+JfVI6zFU6nWGWhWQqfyZKy0aeAb98SZmUDCehf3qTt6Qpbu9IdsVZNEsI88LWeV5Ic09jU7JkCr1G/pmd0FzJjXfTSh9r/5Dlfp/DMz89YOtfmI3LXg2JrulB/d5Lbi4xG2rGJ4/2mPSeVCEFFeEFX8xcuzDL8NV9/QUBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e630797062fc48ea34e810/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:36 GMT"
+      "Fri, 28 Mar 2025 05:15:40 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "83"
+      "56"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 5c566eb455..71b1964d90 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:36 GMT"
+      "Fri, 28 Mar 2025 05:15:40 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
rename to test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_1.json
index 9905787cc2..a252a01c06 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJjdXN0b21lclg1MDkiOnt9LCJsZGFwIjp7ImF1dGhlbnRpY2F0aW9uRW5hYmxlZCI6ZmFsc2UsImF1dGhvcml6YXRpb25FbmFibGVkIjpmYWxzZSwiYmluZFVzZXJuYW1lIjoiY249YWRtaW4sZGM9ZXhhbXBsZSxkYz1vcmciLCJob3N0bmFtZSI6ImxvY2FsaG9zdCIsInBvcnQiOjE5NjU3LCJ1c2VyVG9ETk1hcHBpbmciOlt7Im1hdGNoIjoiKC4rKUBFTkdJTkVFUklORy5FWEFNUExFLkNPTSIsInN1YnN0aXR1dGlvbiI6ImNuPXswfSxvdT1lbmdpbmVlcmluZyxkYz1leGFtcGxlLGRjPWNvbSJ9XX19",
   "Status": 202,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity",
+  "Path": "/api/atlas/v2/groups/67e630797062fc48ea34e810/userSecurity",
   "Headers": {
     "Content-Length": [
       "285"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:34 GMT"
+      "Fri, 28 Mar 2025 05:23:37 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "105"
+      "74"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_1.json
index e4a364acd4..2031c0b40d 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6EMBBE/8U1nIkB++I2VfqkSZRisRewYmxkm0tx4t8DOuUSmoiGep5mnrTaK1F2ignDk59cIrLIiAoICTWRhBWszosyZ/zlgcuqliV/Ixkxa8YFVqxl+ChEw4TgrQAhUJ2X3Br3GYl8v5I+YLuwfUpjlJQq6yeda7ycBu86r5uT8gOF0VBIFiK9MNoFP42R/tMe0C6VEW1L5uyACaq8S2Achnhf27Rvmv/AB9nczrPL5Qc9xkRDggYivsZ9Olv+GKcR97ncuIMcglcYI+7yuLPHuHz1JqE1Me1w+WXnj4w4GHDBrYYxR4Z5Wa7P5kP3vH57ja0GfmZQLquaodCaK40Vmb8Bh4NKC0EEAAA=",
+  "Body": "H4sIAAAAAAAAALWTPW/DIBBA/wuzHTD+DGun7u3SqsMFzg4qBgtwOkT+73UUNa2XygvzPb170umuRJo5RPRPbraRCJYR6REiKiIIZ7zOWZnz7oXVoqhFxd5IRvRt1rTYlKw9tqzhvaw6hLLCrmDr3Gj7GYh4v5Kzx35lzzFOQVAqjZtVrvByGJ0dnDodpBspTJpCNBDohdPBu3kK9B+7R7MqA5qeLFmCFVQ6G0Fb9OGxbWPfmP/AiWru59nV8oOmKVEQ4QQBX8O+nC2fpmnCfS13LlGDdxJDwF0dDzZNy9dZRzQ6xB0tv+zykRELI664UTDlyDE/Fs3qcH54vn17jb2CpuNQ9hwVx1apRiqsyPINtCwnN0EEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:34 GMT"
+      "Fri, 28 Mar 2025 05:15:37 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1528"
+      "3406"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_1.json
deleted file mode 100644
index 77d2c8464d..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/LiQESrp8S4FWTPyoSNpunSZkkgt4dezIdphoxf++M6YtMFXal/YDUsjde/fsu3d5JjRfU5FB3pOiYMtaUcOkINEzyWptZDmtQGjNe6xagXI5KdetgEQ/f52RkglW1uVA0AWHHAM3ShqZSU4iko6S1jwgZ8RwfQgfyxww3B9cxbejlGzPyIJmj3W1JyFRQbkGfMswX0BmpLJy4CSsgOY3CgpQgPKRUEMmRU7VxlJmHNWDSjeVDc0GN6NhL04GKcrJHCueMjGKiaVGdotAQgN9/CEg8IPzht9uBN201Y0651E7fEBozvRjwp7g+pJEbb/puzf3VOE9vJzr6nY0+jG/j2fjQR8hKE5tKlstNjPQBi9ozXLAI5HJdDLAjCWXC8p7TnACvBhTQZeQJyuqcuR9PfFSyboa4g2QbgidoAjgaxgugjDsFiENQ8gukI29xduto3jRKTDO6QK4dt3jTDzax2eywotE3MqYSkeel3FZ540c1s1SiqXMF81Mlh6tmEcNp9pbB95OjPbeU+LtG6A9ntOqcRES2zG+axMvsEOfUdNzg+UpvHep4Jtc6FcZR2WPSh5mf65OLWilV9L8j8q33K31oY30L8f0t1R3yLyzMLlo+uQ1dvS62cWAoKUd2LcGVbTWBw6rmDn1pIKKs2y3IpIKMjc8hyPnH49cO7d16nI3y5jdshRLRLtV4PA47nxjWKb3lMgotLFLyXoNucctf2++4fQmsdbz0Xqw0HeS1yXsTZ6k8aQfz6zpBFqxJ2thSOSjtWltZJJRvjMTLjZZVrW1+b9LpVKQM9wNazg9uUY89OUfcRzYOl12IZyybTEGHDeNffkRR2tvrWAmFTMbEoX2j9stE9fY+D4hbk9OBd981OW6fu5L3ibzQZyk89ZuKp+kgOH7w9E5Jy5nD37Axy8OqaQ0PVBmX32YzK5n02n6vYUIVG9eIL3ZIE6Hk2v7lQG7hXejaT9CbsOfdnHtTDDDvlANyQZtWCLNKE3I9i/IedpCCwcAAA==",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "781"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:36 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "719"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_1.json
new file mode 100644
index 0000000000..b288066199
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e630797062fc48ea34e810_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V247TMBD9FeTn3ea2vZC3bFtWRb2smiwLi9DKjaetWceObKeorPrvjOMC3SIQL/BQKc3MnDn2zDl5JpTtqCyBDZVc802jqeVKkvSZlI2xqlrUII0RQ15vQfucQpgoJunHTxek4pJXTTWWdCWAYeBWK6tKJUhKimkePcbkglhhTstnigGGR+M32d20IIcLsqLlU1MfQUi6psIAvuWYL6G0Sjs6cBbWQNmthjVoQPoIaKBUklG9d5ClQPagi33tQsvx7XQyzPJxgXRKj4qnzK3mcmMQ3VUgoIUR/rAgDuPuZZhcxoMi7KZRN72KHrCUcfOU869wc03SJOyE/s091XgP38/15m46/fB4ny1n4xGWIDm9r123zC7BWLygHWeARyLzxXyMGRuhVlQMPeEcxHpGJd0Ay7dUM8T9ceKNVk09wRsgvT70krD/uh/24nV5NQCaXMEgChGNn8RZd9CLelHcDXvJOu4nDOOCrkAYPz3B5ZN7fCZbvEis21pbmzQISqEadslg16mU3Ci26pSqCmjNA2oFNcEuDloyJvgdk+A4ABMIRuvLJIqIG5lo5yTWOKL/0jTwqxVovHml4a1amR88XvR90fM0+z8TNZLWZqvs39D8mXtwUnSR0fWMflb6HUK3KiaDjluKY+zF604PA5JWbmdPZlTTxpyorOb2XJcaasHL1ibyGkq/QH9Yu3jlGjVVu8+YHTmIDVZ7O/D1uPJib3lpjpCIKI11xuT0htizdrud3CaL29zJL0T5wcq8U6Kp4Cj0vMjmo2zphCdRjkPVSEvSEOVNG6vykopWUGhuqqobJ/VfjaXWwDj6ww7OT26wHkbqi3wZOHhezhTO0Q4YA4Fu417+i6MlB0eYK83tnqR998f7y9xPNrvPiffKhRT7f3W5fp7Hlnf54zjLi8eoXcuvSsLkD56UEJ9zLH7Ax1e+Uitlh6DtsfskX94sF4vivdtSZG+/lwyX46yYzG/clwacE7er6T5E3uXPp7jzKljiXKiBfI9CrBBmWuTk8A1uQ8EiDwcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e630797062fc48ea34e810/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "787"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:41 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "531"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_verify_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_ldap_verify_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_verify_1.json
rename to test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_ldap_verify_1.json
index 65bf870743..36a1baf482 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_verify_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e630797062fc48ea34e810_userSecurity_ldap_verify_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQzU7DMBCE38XnUiuhxCRSbyDUSwUCTqiHjb1JLBw7+CciRHl3NhWquPTmHX3jGc3MWu/ScFCsYoXAXd7kWApR50IUjQAhUN6zDTPafgZWfcys89gQ28U4hIpzaVxSNwrHbe9s61S9la7nMGgO0UDgY87PAYFf+52ngP4VZfI6TtwoGPiIXjfT2XGb7bL/jrJQQH08GioR0DRsOa3nV8IQWTUzSLH7eUnopzfsBwMRCSRHra16pyQL/apIuwfVa7tRco/fQCSuT+dbYjsX4h9nnASz3iQPzlNEVhZ3YrlkXpa70jREiImmY8+Px4fD8YmkEYxWELWz66Sn5RfMPOTlhAEAAA==",
+  "Body": "H4sIAAAAAAAAAHWQS0/DMBCE/4vPpU7T5tFIvYFQLxUIOKEetvYmsXDs4EdEqPLf2QCCHuDmHX3jGc2ZNc7Gfi9ZxfIC83VSbIskT2uxKRHWGyxXCVswrcyLZ9XzmbUOa2LbEHpfcS60jfJK4rDsrGmsPC2F7Tj0ikPQ4PmQ8s8Az//7nUeP7gFFdCqMXEvo+YBO1eOXI83KS0edyYL6ONRUwqOu2XScz9eIPrDqzCCG9v0+ohsfses1BCSQHCdl5BMlGehmRZgdyE6ZhRQ7fAMicX5a1xDbWh++OW0F6PkmubeOIlbbPCumn8zf5f5u6gOESNOxu5vD9f5wS9IAWkkIypp50uP0AUG4mKmEAQAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/userSecurity/ldap/verify",
+  "Path": "/api/atlas/v2/groups/67e630797062fc48ea34e810/userSecurity/ldap/verify",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "271"
+      "273"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:25 GMT"
+      "Fri, 28 Mar 2025 05:23:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "158"
+      "108"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/memory.json b/test/e2e/.snapshots/TestLDAPWithStdin/memory.json
index bcb9e9264b..a2bb606599 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/memory.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/memory.json
@@ -1 +1 @@
-{"ldapGenerateClusterName":"ldap-87"}
\ No newline at end of file
+{"ldapGenerateClusterName":"ldap-311"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json b/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
index 4f1c7b0e8e..4c5410a9c2 100644
--- a/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
+++ b/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:28 GMT"
+      "Fri, 28 Mar 2025 05:07:21 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "35"
+      "20"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_2.json b/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_2.json
index 233b2c2486..cc5bd42513 100644
--- a/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_2.json
+++ b/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_2.json
@@ -8,7 +8,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:29 GMT"
+      "Fri, 28 Mar 2025 05:07:22 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "104"
+      "80"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLinkToken/POST__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json b/test/e2e/.snapshots/TestLinkToken/POST__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
index d2cff1ac05..bb53566cb7 100644
--- a/test/e2e/.snapshots/TestLinkToken/POST__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
+++ b/test/e2e/.snapshots/TestLinkToken/POST__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAE3NS27CMBAA0LvkBOZXCaRuAklqizEitbE8uzaJsOOMiwA1mKp3hyUXeO8vG3wM6id0MVtlXRK/DbUC1/yN94cBqXayPyarJAEdApCeYbWf2mk9yDW/cFomZAv3bbTfeZG31c01Kd+oIhxrJUruR998iFNLJUNdjl/6OnSfT5tskgbDbuP81ui7NcVVVrAAP3Fg9vOtgTn0cIeqGEHpmUzPK+YTS7eTZa9OG5HwjCQZj+w9+38Ahe9ckdAAAAA=",
+  "Body": "H4sIAAAAAAAAAE3N0QqCMBQA0H/xC6ZWUNCLmraRSrYld2+lktPdJSQtif49e+sHznk7Wpme3/vGOBunmdizwprJkK5od9YSizbrbhPwDFM89ykKXyZHD7xCZyF9UFxPkizbaylUrlhQJ6+2moKI7/pbwVlMlVXVng01xkSK2F7EqJvTzwYLSMnPO/BCy2Q3ZhG1eUiWaSe7QylIXqbufFvgGuE0XyZwAV8DkD/HBH7luQtAd6SGbJ3PFyYWH6bQAAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/orgs/5efda682a3f2ed2e7dd6cde4/liveMigrations/linkTokens",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "200"
+      "195"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:28 GMT"
+      "Fri, 28 Mar 2025 05:07:21 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "124"
+      "99"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_1.json
deleted file mode 100644
index 1ef6e771f4..0000000000
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V70/bMBD9VyZ/hiYNo4F8C21BnfoDNQE2pgm5yTX1cOzIdjoV1P995ziwttPQvsCHSmnu7t2z797LM6H5mooM8r4US1bUihomBYmeSVZrI8tZBUJr3mfVCpTLSbnuBiT6/uOIlEywsi6Hgi445Bi4VtLITHISkXScdB8CckQM17vlE5kDhgfDy/hmnJLtEVnQ7LGuWhASLSnXgG8Z5gvIjFSWDhyEFdD8WsESFCB9BNSQSZFTtbGQGUf2oNJNZUPz4fV41I+TYYp0MoeKp0yMYqLQiG4rENDAAH9YEPjB6bF/chz00m4v+nwW+af3WJoz/ZiwJ7i6INGJ3/Hdmzuq8B5eznV5Mx5/e7iL55PhAEuQnNpUtlts5qANXtCa5YBHItPZdIgZBZcLyvuOcAJ8OaGCFpAnK6pyxH09caFkXY3wBkgvhM/BMgvOw3ARhGFvGdLwrJd3EY3txE/34mHvHOOcLoBrNz3OxKN9fCYrvEisWxlT6cjzMi7r/DiHdaeUopD5opPJ0qMV86jhVHvrwGvIaO9fTLx2ANrjstDHwZldBAW8mRNf4og+pKnnVstTePNSwRe50K889vru9dzN/mCiWtBKr6T5H5p/crdWijYyuJjQn1LdInSjYnLW8clrbO91p4cBQUu7szszqmitd1RWMXOoSwUVZ1ljE0kFmVugN9butGlUl80+Y3bXQhRY7ezA1ePK841hmW4hEVFoY43J6g2xJ12/FeBodp1Y+fkoP1joW8nrElqhJ2k8HcRzKzyBcuzLWhgS+ShvWhuZZJQ3gkJzk2VVW6n/bSyVgpyhP6zh8OQa62Egf4n9wNbxsqZwiLbFGHB0G/vyPY52srWEmVTMbEgU2j/OX6ZusvFdQpxXzgTfvNflunm2LW+Sh2GcpA/dZi2fpIDRG8sBxOW0xff4+MlVKilNH5Rpu4+S+dV8Nku/WpdD9ualpD8fxuloemW/NLRorQ3FhZ7cLKn9JDm/P5zn2ulhjhOiGpINSrJEwHGakO1vcRO4RhkHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/logs-282",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "782"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:48:06 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_2.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_2.json
deleted file mode 100644
index 5b3cf950af..0000000000
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW/aSBT9K9U89KUBfyTg1FK0okArKggRdppuV6tosC9mNuMZa2ZMSyP+e+94nARoNtp9aCWQwPfecz/P8T2h+YaKDPKhFCtW1IoaJgWJ70lWayPLeQVCaz5k1RqU80m5DkIS//X3CSmZYGVdjgVdcsjRcKWkkZnkJCbpNAluQ3JCDNf74TOZA5pH4/eD62lKdidkSbO7umpBSLyiXAM+ZegvIDNS2XLgyKyA5lcKVqAAy0dADZkUOVVbC5lxrB5Uuq2saTG+mk6Gg2ScYjmZQ8UuE6OYKLRF14baWIQnpRSFzJex53FZ6E54Hnb0Gk0d38dPt1Dim+62Tp0cNl0BJg4jP4hOngkI/m9A+FKA9wfu4sKoGl7T2qwTWasMLmiOe3itoOIsowmYC2o41Z2z8ttdTzxAY+cPTSZq89TnG602e70+n70ZKU7cwAi/GBz6Ya/jn3bCfhr047Pz2O99wQw503cJ+w4f3pH41O/67skNVVjgw+LfX0+nf97eDBaz8QhDcHtqW9l1DMwCtMEL2rAccOfkcn45Ro+CyyXlQ7fRBPhqRgUtIE9sY4j7eBKFknU1sTvsR3AWrrLwbRQtwyjqryIanffzANHYnr13YI/6b9HO6RK4dufNmbizP+/JGi8N49bGVBqnlXFZ581w2kF1M1l6tGJeM3pvE3pNMdr7t0q89kL14+SJvWneHDJf4cB/S1LPcc9TOHmp4KNc6sc6DvIe5Nz3/s2FakErvZbmv5T55LuzWmUto3cz+o9UnxC6kTly3rXMaG0Hj7t9NAha2pvd21FFa70nQxUzx8LVErFRmAoyd0AvnF2vSVSXzT2jd2AhCox2euni8eT51rBMt5CIKCyfM7B8Q+xZ4LcEnMyvEks/H+kHS/1J8rqEVgmTdHA5Giws8QTScShrYUjsI71RT2SSUd4QCtVfllVtqf6z8lYKcoYCuoHjzjXGw0h+FYeGnavLisIx2g5twFGO7cNf0drpzhbMpGJmS+LI/nH6cuk2O7hJiHuZzAXf/qrhun22Ka+T2/EgSW+D5iy/SwGTF44DiPNpg7/gz1cuUklphqBMm32SLD4s5vP0c+Ck3jyETEZTK6OGFq2sIbFQj5sDte9r9zI83uXGcWGB26Eaki3SsUSwaZqQ3Q8QgSumNggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/logs-282",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "883"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:57:02 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "78"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
index 1e46f68a0e..70d6bc03de 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongodb-audit-log.gz",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters/atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net/logs/mongodb-audit-log.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:04.000000963_2025-03-26T16:57:04.000000963_MONGODB_AUDIT_LOG.log.gz\""
+      "attachment; filename=\"atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_2025-03-27T05:24:10.000000641_2025-03-28T05:24:10.000000641_MONGODB_AUDIT_LOG.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:04 GMT"
+      "Fri, 28 Mar 2025 05:24:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "119"
+      "104"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb.gz_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb.gz_1.json
index 8cedbf4274..dc68d5ea22 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb.gz_1.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongodb.gz",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters/atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net/logs/mongodb.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:03.00000078_2025-03-26T16:57:03.00000078_MONGODB.log.gz\""
+      "attachment; filename=\"atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_2025-03-27T05:24:10.00000007_2025-03-28T05:24:10.00000007_MONGODB.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:03 GMT"
+      "Fri, 28 Mar 2025 05:24:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "137"
+      "109"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_2.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb.gz_2.json
similarity index 68%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_2.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb.gz_2.json
index 1f8ca090d1..efd24bc52e 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_2.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongodb.gz_2.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongodb.gz",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters/atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net/logs/mongodb.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:06.000000151_2025-03-26T16:57:06.000000151_MONGODB.log.gz\""
+      "attachment; filename=\"atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_2025-03-27T05:24:11.000000139_2025-03-28T05:24:11.000000139_MONGODB.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:06 GMT"
+      "Fri, 28 Mar 2025 05:24:11 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "114"
+      "94"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos-audit-log.gz_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
index 4d7de93ada..50d20be4f8 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongos-audit-log.gz",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters/atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net/logs/mongos-audit-log.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:05.000000562_2025-03-26T16:57:05.000000562_MONGOS_AUDIT_LOG.log.gz\""
+      "attachment; filename=\"atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_2025-03-27T05:24:10.000000889_2025-03-28T05:24:10.000000889_MONGOS_AUDIT_LOG.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:05 GMT"
+      "Fri, 28 Mar 2025 05:24:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "78"
+      "107"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos.gz_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongos.gz_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos.gz_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongos.gz_1.json
index b21d8a4d4c..11683afbd4 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos.gz_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_logs_mongos.gz_1.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongos.gz",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters/atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net/logs/mongos.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:04.000000391_2025-03-26T16:57:04.000000391_MONGOS.log.gz\""
+      "attachment; filename=\"atlas-er9w8f-shard-00-00.2luul.mongodb-dev.net_2025-03-27T05:24:10.000000327_2025-03-28T05:24:10.000000327_MONGOS.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:04 GMT"
+      "Fri, 28 Mar 2025 05:24:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "102"
+      "169"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_logs-447_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_logs-447_1.json
new file mode 100644
index 0000000000..cfb78f0f93
--- /dev/null
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_logs-447_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW/aMBT9K5OfW/JBgSxvKbCKiY+KpO3WaapMcgleHTuyHSZa8d93jbONMnXaS/cQKfG99/jY956TZ0KLLRU5FEMp1qxsFDVMChI/k7zRRlaLGoTWfMjqDSiXk3EdhCT+8vWMVEywqqnGgq44FBi4VtLIXHISk2yaBg8hOSOG6+PymSwAw6Pxh+RmmpH9GVnR/LGpWxASrynXgKsM8wXkRipLB07CCmhxrWANCpA+AmrIpSio2lnInCN7UNmutqHl+Ho6GSbpOEM6uUPFU6ZGMVFqRLcVCGhghA8WhH7YO/e752GU+b046MW98B5LC6YfU/YEV5ck7vod363cUYX38PNcH26m088Pd8lyNh5hCZJTu9rulpglaIMXtGUF4JHIfDEfY0bJ5YryoSOcAl/PqKAlFOmGqgJxf524VLKpJ3gDpD+AfteP+r2oH/SDsOf3u+twEHURjR3Fo4HfD9f5RQS0ewHvfR/jnK6Aa9c9zsSjfX0mG7xIrNsYU+vY83Ium+K8gG2nkqKUxaqTy8qjNfOo4VR729A7kNHea0y8tgHa47LU5xcXA2Jbxg994mts0X/Z1HOj5Sm8eango1zpXzxe7Ptiz+Ps/0xUC1rrjTT/QvN37t5K0UZGlzP6TapbhD6omEQd2/Q29mK508eAoJWd2aMe1bTRRyqrmTnVpYKas/xgE2kNuRug18cuWlsGoqkO84zZgYUosdrZgavHkec7w3LdQiKi0MYak9UbYs8CvxXgZHGdWvn5KD9Y6VvJmwpaoadZMh8lSys8gXIcykYYEvsob9oYmeaUHwSF5iarurFS/9NYagUFQ3/YwunJNdbDSH4XLwN7x8uawinaHmPA0W3s4lscrbu3hJlUzOxIPLAfzl/mrrPJXUqcVy4E373V5bp+tlvepA/jJM0egsNYPkkBk78MR0RcTlt8j6/vXKWS0gxBmXb3Sbq8Wi4W2acAK5C9+VkyXI6TbDK/sn8aWrbWhuJCTz4Mqf0lOb8/7efW6WGJHaIa0h1KskLAaZaS/Q9rFrC4GQcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters/logs-447",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "793"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:53 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "70"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_logs-447_2.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_logs-447_2.json
new file mode 100644
index 0000000000..6c09d8d8a3
--- /dev/null
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_logs-447_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW/bNhT9KwMf+rLY+nBsqwKCwbXdwoMdB5bSbB2GgJauZC4UKZCUCzfwf++lqKSO1xbbQwvYgMR77+H9OkePhOZ7KjLIp1IUrGwUNUwKEj+SrNFGVusahNZ8yuodKOeTch2EJP7r7wtSMcGqppoLuuWQo+FGSSMzyUlM0mUS3IfkghiuT8NXMgc0z+ZvJ7fLlBwvyJZmD03dgZC4oFwDnjL0F5AZqWw6cGZWQPMbBQUowPQRUEMmRU7VwUJmHLMHlR5qa9rMb5aL6SSZp5hO5lCxysQoJkpt0bWhNhbhSSVFKfNt7Hlclrp3eTnu6R2aer6Pv37Im4b3O6deDvu+ABOHYz8YX3wlIPi/AeH3ArzfcBZXRjXwijZml8hGZXBFc5zDKwU1ZxlNwFxRw6nugXr9MSqeoLHypyITtf9S569a7U9q/frtbUux4wZm+Mfg0A+HPX/QC6PUH8bBMB6GH/CGnOmHhH2Cd29IPPD7vju5owoTfBr829vl8s/7u8lmNZ9hCE5PHWo7jonZgDa4QXuWA86cXK+v5+hRcrmlfOommgAvVlTQEvLEFoa4zytRKtnUCzvD0RhGAz8aDaNRMArCoT8aFOE4GiAaO7FHY38UFtllBHRwCa992yROt8C1W2/OxIN9fCQ73DSM2xlTa+xWxmWTt83pGtXPZOXRmnlt67196LXJaO9bmXjdhurnzhO707xdZF5gw3/KpZ7jnqew81LB73Krn/N4ce+LO0+9f3KiWtBa76T5L2l+8T1arbKW2ZsV/Ueq9wjdyhyJ+nbone3FcX+EBkEru7MnM6ppo09kqGbmXLg6IrYKU0PmFujbaxcVNgPRVO0+o3dgIUqMdnrp4nHl+cGwTHeQiCgsnzOwfEPsVeB3BFysbxJLPx/pB1v9XvKmgk4Jk3RyPZtsLPEE0nEqG2FI7CO9UU9kklHeEgrVX1Z1Y6n+b+WtFeQMBXQP55VrjIeZ/CheGo4uLysK52hHtAFHObaHP6K0wdEmzKRi5kDisX1x+nLtJju5S4j7mKwFP/yo5rp5dlfeJvfzSZLeB+1afpICFt9Zjog4ny74Az7+4iKVlGYKynS3L5LNu816nf4ROKk3TyGL2dLKqKFlJ2tILNTjdkHt99p9DM9nuXdc2OB0qIbkgHSsEGyZJuT4GVimkN42CAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters/logs-447",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "894"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:24:09 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "82"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_provider_regions_1.json
index 27e8c77259..2f59e198c7 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGet0KZRTpcOANW3EwRGJ7qmFpU5LUhw3/+2JF1Clt9piTL+d8yUnygxhNvySyP3/QTkCMbLRTKpM2xiHjefQUwb6R8HTLo00j5AkmGcVEMSLxvoW3gueZxL0+dFpRNyTRhvS6Vps8h934pRfrFLlUICTOBN/TCAQWsKU8la801XMRDHieKkeJHGpnRDru0q8pCsIZW81aRrYwyRPHqlEFiZyBmOmIYzWbqI4EMC0sgcXosDoOZc7UaTM0lYqkIfj0G04RsieUkQ2D+cmhCEYQE70G2UeHOkpJAjrjwl97rh+sLXSoXzExYfIealVAS+8+099qBVOaaOCuB94kmLujcitvsZ5M58Gwknqk9Rgq9TpD7QrIVP7MlRb1XYP+uDMzyJ8ugmF1J2/I0t3ekJ0KsmiWkeeFrPK8kOaeRqdkSJX6jT2zu6A5k5pvJpS+V/+hSv3fR2b++sFWP7GbFnSNyX7pwX1cC64ucatZDM8f7THp0i9CiivCir8Y2dbhF6VhEZQUBgAA",
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKm1VmlUEaRDgd+YRUHQyTaWw1Lm5KkPkz874sVUae02WNuTu49yU1yQIym3xK5Xwe0ExAjF+2UyqSL8YbxPHqJYN9IeLrl0bqx4QkmGcVEMSLxvom3gueZxE4HnJbVddpdx3bsZttyWnGz023pFLlUICTOBN/TCAQWsKU8lW801XMR9HieKk+JHGoXRHr+IqwpCsIb2lYtI1sY5Yln16iCRE5ATHTEsy0L1ZEApoUlsBgdl6ehzJk6b4amUpF0AyH9gXOE7AllZM1genYoghHERK9B7smhjlKSgM44D1eBH85WNjrWb5iYMPkINSugRfCY6W+1gilN1PNXvWA0m/qDcqtgvhqNp7N+JfVM6zlU6nWBWhWQqfyFKy0a+gb98SdmUDiez/rVnbwjS3d7R75WkEWzjDyvZJXnlTT3NDolQ6rUbxiY3QXNmdR8N6H0vfoPVer/MTDz1w+2+ondtaBtTHZKD+7zVnB5jdtWMbx8tKeki7AIKa4IK/5i5NrHX1nPvwsUBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:51 GMT"
+      "Fri, 28 Mar 2025 05:15:52 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "93"
+      "57"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_processes_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_processes_1.json
index 4bd8faeee1..be3c77c2b7 100644
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e6308658616125063f2783_processes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWVX0vDMBTFv0sefLJN2tlOC0PG9GGgs0xfVESy5q4NpknJn8GQfXfTTX1QinPgVOhLeu9pfrnnkD4jweWTQdn9M6o0zFGGKmsbk2FcCOVYwGAR1kqWis3CQtWYNhxTK6jBixiXWrnG4LQPRzFL5pTNaJpEPXpctIs+brQqwBgwp1wWwjEYKSftwGoHBw0tYeLqQXTALdQmB537N4OIEHSINAhPYkDM0eqhXRon7Iay0EAtMF+OSZwEpBfE6U2UZkdJFqd3XruGGrcNXVy+qVLGSlqD71qfJqiWS+H6gamoZgEh/gmZnPHy7fDrQUiwXsvZt1VZ3CdRu68X2ZzL8jN+mpGkxd+LH3hH/A++NEpbtCm2tUbwgl6DnXQP1n/DLht47Zie5xfj0fDx+nx0NTkbTm992RnQQ8GpnwF65w3Sk2QrbxagDVfSa49DEqZodbi/xEQ7JaZD9V8S8xX+DyUmn44vt89LtzO/mZd4p7x0qP5LXr7C/yM3TLc3nxLjKa2yVKz/bSjrrV4AfL+YblQHAAA=",
+  "Body": "H4sIAAAAAAAAANWVXUvDMBSG/0sudrU2abp+rDBkTC8GOsv0RkUktmddMG1KPiYi++9mm96oZTpQEXqTnvOWJ+c80GckePOgUXbzjJYKFihDS2NanWFcCGlLr4SVX8umkuW9X8gas5ZjZgTTeEVxpaRtNY4TiEOSxlEaB3FAIxKHC5qkIW6VLEBr0Ee8KYQtYSJtY0ZGWei1rIKZrUdBjxuodQ4qd29GASGojxQIR6JBLND6dnPUVpgdZaGAGShdmRIaeST0aHpJooyGWTi4dtkt1HTT0MXlmpZSm4bV4Lq2t/FADR/ThaeXTJUeIe7xqbBWvF1+O4gGjMvy8tupjCYkSFzWhUzOm+oz/Gi4wf+VfeAD8d/tpZXKoF1xU2sFL9gFmFn3YN03zFMLrx3zk/x0OhnfXZxMzmfH4/mVK1sNaiw4czNAQlbaGwySL61lBUpz2bhY6hM/Ruv+78kSHCRLR+q/yLIP/+9l6V7LX8pCD5KlI/VfZNmH/0Oy5PPp2ZdU6V7KB1UcnpGGie3PDGXh+gWM8aEwRQcAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/processes",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "413"
+      "412"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:13 GMT"
+      "Fri, 28 Mar 2025 05:24:09 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "32"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index d6037b05da..f16bf031c8 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:48:04 GMT"
+      "Fri, 28 Mar 2025 05:15:51 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_1.json
index ca645b92d7..905fd77dc8 100644
--- a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGCITVg7dW+XVh2MfSZWDUY+kw4R/16iqGlZKhbP9/TuSae7EuVmjBCe/DxG0hYZUQFkBE1awgp2zIsqZ/yl5G3dtEX1RjJibzMuoGZGsZMQHROCGyFFw3W5zp0dP5G071dyDmBW9hzjhC2lyvlZ5xouh8GPvdfdQfmByslSGZ1EemG0D36ekP5jD+BWJYIzZMkSrKDKj1HaEQI+tm3sG/MfOFHN/Ty7Wn7QNCVaRtlJhFfcl7Pl0zRNsK/lziVqCF4BIuzqeLBpWr7ONoKzGHe0/LLLR0ZGOcCKO99jDgzy8iRWhw/98+3bj2C05A2TlWGgGQitudJQk+UbLmMikkEEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBRF/8UzxMbEhrJ26t4urTo49gOsGIz8TDpE/HsdRU3LUrEwv6Nzj2T5SrSbMUJ49vMYScMyogOoCIY0hDMuclbmvH5loilEI4p3khF7u8kKZMlqKWpZyIILJsuWV3WZ7s6OZyTNx5X0AdrE9jFO2FCqnZ9NbuByGPzYeXM6aD9QNVmqolNIL5x2wc8T0n/sAVxSIriWLNkOE1T7MSo7QsDH2sq+Mv+Bd6q5P8+mlh90nxKjojophDfclrPm92maYFvLndupIXgNiLCp48Hu0/LV2wjOYtzQ8ssunxkZ1QAJd77DHDjkx6ciOXzoXm6/XUBrlKy5SjtgOFTGSG3gSJZvX6L04UEEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:48:02 GMT"
+      "Fri, 28 Mar 2025 05:15:50 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1991"
+      "1707"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_1.json b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_1.json
deleted file mode 100644
index 1267d05cd9..0000000000
--- a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/LiSkg7T5lgKtmPglkrZbpwmZ5ACvjh3ZDhOt+N93jmkHTKv2pf2AFHJ37559916eCc03VGSQd6VYslWlqGFSkOiZZJU2spiUILTmXVauQbmclOtWQKLvP85IwQQrqqIv6IJDjoGpkkZmkpOIpMOkNQ/IGTFcH5aPZA4Y7vWv49thSnZnZEGzx6rcg5BoSbkGfMswX0BmpLJ04CSsgOZTBUtQgPQRUEMmRU7V1kJmHNmDSrelDc360+GgGyf9FOlkDhVPmRjFxEojuq1AQAM9/GFB4Afthn/eCDppqxN9voj89gOW5kw/JuwJbq5IdO43fffmniq8h5dzXd8Oh9/m9/Fs1O9hCZJT29J2i80MtMEL2rAc8EhkPBn3MWPF5YLyriOcAF+OqKAryJM1VTnivp54pWRVDvAGSCeEz8EyCy7DcBGEYWcZ0vCik7cQjR3E20fxsHOJcU4XwLWbHmfi0T4+kzVeJNatjSl15HkZl1XeyGHTLKRYyXzRzGTh0ZJ51HCqvU3g1WS09y8m3n4A2uNypRvBhV0EBbyeE1/iiD6kqedWy1N481LBF7nQrzyO+h71PMz+YKJa0FKvpfkfmn9yd1aKNtK7GtGfUt0hdK1ictH0yWvs6HWzgwFBC7uzBzMqaaUPVFYyc6pLBSVnWW0TSQmZW6A31q5dN6qKep8xu2UhVljt7MDV48rzrWGZ3kMiotDGGpPVG2KPWv5egIPJNLHy81F+sNB3klcF7IWepPG4F8+s8ATKsSsrYUjko7xpZWSSUV4LCs1NFmVlpf63sZQKcob+sIHTk2ush578JY4DO8fLmsIp2g5jwNFt7Mv3ONr5zhJmUjGzJVFo/zh/GbvJxvcJcV45EXz7Xpfr5rlveZvM+3GSzlv1Wj5JAYM3lgOIy9kXP+DjJ1eppDRdUGbffZDMbmaTSfrVuhyyNy8l3Vk/TgfjG/ulAevE9WraD5Fz+dMpbpwKZjgXqiHZohALhBmmCdn9BnYPkDcPBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "777"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:48:05 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "520"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e6308658616125063f2783_clusters_1.json b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e6308658616125063f2783_clusters_1.json
new file mode 100644
index 0000000000..8c1a4ca824
--- /dev/null
+++ b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e6308658616125063f2783_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXU/bMBT9K5OfofkobbO8hbagTv1ATYCNaUJuctt6OHZkO50K6n/fdR1Y6cS0F3iIlPjec3zse8/NE6HFhoocir4US7aqFTVMChI/kbzWRpazCoTWvM+qNSiXk3EdhCT+/uOElEywsi6Hgi44FBi4UtLIXHISk2ycBvchOSGG60P4RBaA4cHwIrkeZ2R3QhY0f6irhoTES8o14CrDfAG5kcrKgaOwAlpcKViCApSPhBpyKQqqtpYy56geVLatbGg+vBqP+kk6zFBO7ljxlKlRTKw0slsEEhoY4IOA0A87p377NIwyvxMHnbgT3iG0YPohZY9weU7itt/y3cotVXgPz+e6uB6Pv93fJvPJcIAQFKe2ld0tMXPQBi9owwrAI5HpbDrEjBWXC8r7TnAKfDmhgq6gSNdUFcj7cuKVknU1whsg3R50237U7UTdoBuEHb/bXoa9qI1s7CAe9fxuuMzPIqDtM/js+xjndAFcu+pxJh7s6xNZ40Uibm1MpWPPy7msi9MCNq1SipUsFq1clh6tmEcNp9rbhN5ejPbeUuI1BdAelyt9enbWI7ZkfF8nvsQSfcimnmstT+HNSwVf5EK/6Hi176s9D7M/WKgWtNJraf5H5p/cnbWijQzOJ/SnVDdIvXcxiVq26E3s1XKriwFBS9uzBzWqaK0PXFYxc+xLBRVn+X5MpBXkroHebrtoaRWIutz3M2YHlmKFaDcOHB5bnm8Ny3VDiYxCGzuYrN+QexL4jQFHs6vU2s9H+8FC30hel9AYPc2S6SCZW+MJtGNf1sKQ2Ed709rINKd8bygcbrKsamv1vwdLpaBgOB82cHxyjXgYyF/idWDndNmhcMy2wxhwnDZ28T2O1t5ZwUwqZrYk7tkPN1+mrrLJbUrcrJwJvn2vy3X1bLa8Tu+HSZrdB/u2fJQCRv9ojoi4nAZ8h6+fHFJJafqgTLP7KJ1fzmez7GuACFRvniH9+TDJRtNL+6cBO4n3rWl/RG7KH1dx41wwx7pQDekWjVgizThLye43PnlNAA8HAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e6308658616125063f2783/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "788"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:52 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "560"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/memory.json b/test/e2e/.snapshots/TestLogs/memory.json
index a2d50dfb22..0d3cecbfe0 100644
--- a/test/e2e/.snapshots/TestLogs/memory.json
+++ b/test/e2e/.snapshots/TestLogs/memory.json
@@ -1 +1 @@
-{"logsGenerateClusterName":"logs-282"}
\ No newline at end of file
+{"logsGenerateClusterName":"logs-447"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_1.json
deleted file mode 100644
index f76bca1a07..0000000000
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXVxYzl6U2w3cOFLYCnNNotFQIljmxuKFEjKhRv43zs01a7tYhf70j4YkDWcM4czc47eCGU7KitgIyXXfNNqarmSJH0jVWusqpcNSGPEiDdb0P5MIUwUk/TPv65IzSWv23oiaSmAYeBBK6sqJUhKilkevcTkilhhTtPnigGGx5MP2eOsIIcrUtLqtW06EJKuqTCAbzmel1BZpR0duAhroOxBwxo0IH0ENFApyajeO8hKIHvQxb5xodXkYTYdZfmkQDqVR8Vb5lZzuTGI7jIQ0MIYf5gQh/HNddi/jgdFNEj7w/T97TOmMm5ec/4V7u9I2g97oX/zRDX24fu9PjzOZp9fnrLVfDLGFCSn942rltkVGIsN2nEGeCWyWC4meGIjVEnFyBPOQaznVNINsHxLNUPcHzfeaNU2U+wAGSTwPma3A8pKOriJ+nRYDcJ+mSAaP4nf3iZJGSfJYJ3Q5GYYrzEuaAnC+OkJLl/d4xvZYiMxb2ttY9IgqIRq2TWDXa9WcqNY2atUHdCGB9QKaoJdHBzJmODfmATdAExQA3a5Mtc3w5C4qYnjqMQap/S76gZ+wQKN/VcaPqrS/KByVvqs7Onp38/VSNqYrbL/h+k/Zw9Oky4yvpvTv5X+hOhHOZNhz7W/i5297g0wIGntlvd8WA1tzYniGm4vNaqhEbw6WkbeQOWX6XQFh+crGDFXq62Pu42nIwexwWxvDT4f11/sLdLoIBFRGutMymkPsedR2IlxunzInRRDlCKU5pMSbQ2d6PMiW4yzlROhRGmOVCstSUOUOm2tyisqjuJCo1N10zrZ/2wyjQbG0St2cHlzg/kwVl/keeDgeTmDuEQ7YAwEOo97+Suu1j84wlxpbvckTdwf7zULP9zsKSfeN5dS7H9Vc/08u5KP+csky4uX6LiZX5WE6X/4k/Mvd6ZLfsbHdz5TK2VHoG1XfZqv7lfLZfFHhBnI3n5PGa0mWTFd3LuvDt10NocSQ38+Lqn7PHnvv5znzktihROiBvI9CrNGwFmRk8M39XzZlSUHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/clusters/metrics-580",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "800"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "75"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_2.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_2.json
deleted file mode 100644
index fff0453b9c..0000000000
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbY/aRhD+K9V+yJce+IUDg6VTRYBEVHCcsC+XpqpOa3sw21vvWrtrt+TEf++s7UuApFFVKZFAgp2ZZ2Znnnn2mdCspiKFbCbFjuWVooZJQcJnklbayGJTgtCaz1i5B9X6xFx7Pgl//+OKFEywoioWgiYcMjTcKWlkKjkJSbyKvEefXBHD9Wn4WmaA5vnizfR+FZPjFUlo+lSVHQgJd5RrwFOG/gJSI5UtBy7MCmh2p2AHCrB8BNSQSpFRdbCQKcfqQcWH0pq2i7vVcjaNFjGWk7aoeMvIKCZybdG1oTYW4UkhRS6zJHScAtAh1b3h2O3pPVp7rouffpLD5O9+59fLoO4LMKEfuF5w9fUY73/E+N+KcX7BodwYVcErWpl9JCuVwg3NcCCvFJScpTQCc0MNp7rnXfOhqV+gsQUvt41U/fnCP2tVn1/66wU07cXuG5jjF+N91x/23EHPH8XeKByMw+vJB0ySMf0UsY/w9jUJB27fbU8eqMIaX0jw5n61+u3xYbpdL+YYgpNUh9KOZmq2oA2yqWYZ4PzJ7eZ2gR45lwnls3a6EfDdmgqaQxbZuyHuJ3rkSlbl0s5zFMC1n01GNEvoaOgN6DgduYMkQDR2Yp9MgiDxg2C0C2gwHPs7tHOaANct1TkTT/bnM9kj6zBub0ypsWEpl1XWNKdrVD+VhUNL5jTdd2rfaYrRzr9V4nRs1afNJ5bivOE132HPf1Rep91GR2H/pYJfZaI/lXKW+iztqfePr1ULWuq9NP+l0s++Rytg1jJ/vaZ/SvUO0RvtI+O+bX9nOzvuj9AgaGHJez6sklb6RJ5KZi4FrdvLRnlKSFsynVJwfE5BL7O5qqLhNnp7FiLH6FZH23ikPz8YLKODRERh1zsFu3uIvfbcbhmXm7vIrqKLqwiJfid5VUCnkFE8vZ1Pt3YJBa7mTFbCkNDFVUd5kVFKebNc+CrIoqzs2n+pyKWCjKGw1nB5c43xMJd/iXPDsa3LCsQl2hFtwFGm7eH3uNrgaAtmUjFzIGFg/7Rac9sOd/oQkfaR2Qh++F7NbefZpbyPHhfTKH70GmZ+lAKW39Anq1/Wpwv+gD9/aiOVlGYGynTZl9H27Xazid97rfKbl5DlfGUl1dC8kzhcL9TmhqD2HW8fyctZ1u06bHE6VEN0wKUsEGwVR+T4D5WdZY1OCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/clusters/metrics-580",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "900"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:39 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "78"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_data_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_data_measurements_1.json
deleted file mode 100644
index a5a228a5ef..0000000000
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_data_measurements_1.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAM2Xa2/aMBSG/0s+7FNxfHw3UjUxyFY0ChkEbd00oUDSEg0SlAS0qep/nwls4jIaVKCaFSERbOc57zl+D3m0wjiwqhbBhFcwrRDhgagyc7Gv1pX1kPrxfOKnUf7LTHI9im+Lu8l81lwuEzJkJNDCD4a+4EB9NRKYDqWZNE6yvJjj5xM/qwCb8HxRycZ+GlQwNhcaPoT6J5om8UMSDCtBuEBxmFeJxLBcP4niH5lV/fZojdPw3uwzzvNZVrXt0SSZB8X09VI0Sqa2P4vs4kn2gtgFYGYforNnaTIKsyzM7JfA2UGU/cjswM99exr62TwNp2GcZ2831LoutHozC9MoCa5daHhAbkxUaTgxoWTh5N56uvr/QvtLuEW0RbPMq/X0/craDL3I01IQN4n+fM2jaZjl/nR2uLwW/mQeWlWMiFYEa820kJRoSpf7x/7U/GY1mr2PA7fW9Zpes9MeNDtub9B1ag2zfB5Hy2dZvXqtVesOXKc76Dn1TrtRaPtiHIqEJBRjTiWnGIQqofncbXrOJXG0xBwwU5JgygSU4Hgdr9a6HA5GnMjN8Yw8rZrntOt3u/m6bbZazRVL71QYzShoSaTSAFwwUQ6zm67z0QAhgJiQmlMlQGH9TB17N91O/8ON2/d21Xl35zm9s6ULiMZAkcTS8ChiRDqKaVek80IRJLVxLcK1pMVwAB/G6rm1ujN433X2gE6jYAgYIRKAidXgji6j6PecvVydRqEkMokx5suUElIxUoZgklB32t6uIOvbp1YLMuVi3JgDUAJcsmNpdoQ5Cw1GGFPFNcdMA9eYYbbfGj71nb4zaDiud7NneqcaryKKCi2EoqY3Cb15dG5rXwav35qUQMZjqBRcarZtvYeALtydCEcUM04ByPIYcU6PYLp4ixI743mmi7cpggSWxmwUX32KksRdvlURpDADiQXwlfuxbQv+B9QlbdiYsOkGdN0M9DEgF3FiSiUBhoXSgoqS4/46bgyCmr/EHBhw0CV1fJwjmy1mfppHeZTE7dVeS0Izdf3ucMpbmwkszQ8F9vQbNtZaJG4OAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/disks/data/measurements",
-  "Headers": {
-    "Cache-Control": [
-      "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
-    ],
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "803"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:43 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "392"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasProcessMeasurementsResource::getSpecificDiskMeasurements"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_1.json
deleted file mode 100644
index f4a0e08762..0000000000
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAM2ca2/iShKG/wsf9tPE9P0S6WjlmIZ4Y2yObSYzs1pZzIQzE21uCmR0Vkfz37dsSIINDtnE3WyEkEjAT1W5Lm+7Tf7qzW8uesc9ggg/QvSIiByLYyaPKf3S+9D7fj+7ebia3V8u/wNvmuQUjavf3j7cheXHhJwzcqHF7OLrTHBMZ+qbQPSrhDf9uF0sq/fMllezxRFmV3z582jxY3Z/cYQQPLyv3+f6T+/69ub77cXXo4v5T+9mvjwmEuHy81eXN/9e9I7/+Vfvx/38DzjOj+XybnHc73+7un24qN6+/qj37fa6P7u77Fek/k/Srwxc9Nus69/d336bLxbzRf8txvWv57PFw/38en6zXPx9I0S/VQH62938/vL24rcJHuSYnIIr9/MrsH8xv/qj9+vD/58/TxbWLKpZU57M3q9/fehtul6dnIvZcja5vXx8uby8ni+Ws+u79pz6Obt6mPeOIWhX5RFvZtfwqudnmUnzIjWjaeSn8LaHm8vymL0s8OEXxcSkRWaCJB5UMewYe+6ncRiPXGPHmXPkFJ6dMQM/ODXFyefcZHBm/UERxnmyQV/9xQH8PA3z3MTFME3G1vgES8WVh7ZsGIRp/nllSRP+TiJTWukdRDjLAxtA5CEmqJQKc4oEVkJIsQUfhlFUpH4ebp5qCHJg4vz9eMSlJpgJeMJcKraBX8XZHp6heqiTODYBcOJsq6Le7ecmZ5pmSZoVeZL7UZFMTNwxrlk4NV4ejiGXkmlur2sQSpkkNZ8HJ0WWJ6k/MiszOq4biQRt8gZ+7hdZ+MUKEe2hFedJkX3OcrPVnmyENowH5pM1XxvpNEiC6RhqrxibPA2DchLk0zQ2A2djaMuCMC5n4SEtmE4gAQ5pwMBExqUB5lOe+hD4YVJMyqoe+tMo3+6bneHrBTeKkhMosigJzgpob2kZid+nZrqd/92373Z2KYlMand4tNNLTdQ9HUZzjT824yT9DK5m4aAcwM+0sRn5HXQbSrjeRfwIYmBaO7UdARuJvcaN/cmkVk52aLHJz5P0bC1rw7jZuW2Vb51bVwNOwPF0DEkEmZvZ7BoNeDIJkmkMVVIEY3et8pkK7qafD8BdTacDgFdT6QDgPI+cj8Rn+sjk0EQO4fdKCR0AnJpJdKCqqtAHS/GKfrA8r+jOT7qpluNxVgAoLvwY1pPpwOF1qA0LypYawrg6C6PIaa0X5pMJpqUR1ZK6En+bk2wMBoUrcreSYRtdKb8DsYNkPPZjS57XpW8yiZJRkUX+R1NE/ggkWla1ejBj87zbApelFgZV2lV4G1yGd4At+km5R2s/bfBHh4tBOBxaiDbCVHCin3/Udvyhvxejk6qiT5PpZrcZhWtt/vzHLrO+km3rxE/Squm5vNyxG18kJ/8wgUPxvDIj91NQN2E8erJjUo2hlktATixYR8KmJfVFcB4GZwaA/kc/jPyTaLv7u2BWbd/qxYanOVvkp2kCmrqMemrKaJdhf5rCjnMwm5RbAnkCzSg7KwbTtEqGpFMJBA9Wu8LsYaUJ0ppQRrBkm51ykiaBybIimEyb+3Fv26dowGEoYCQFx0wpjbFuY58ZyPyoa3o9JTZ5wWkYDVITW3H6FVg7/mLqcc0EYlpgiZGSeIcdcZKO/Sj8AmVg66wjjyNOFeGSMca5Fny/HS4zoIE+QDK0WWAnCgJ5ElFBEZcSEby5Tzr2PxW2m0CZlQhzwTVhHAnIzxcMcJEHTabDBGhF2/GbIo9yrDAnSnHoCC2WOOgJ2JOaI6mIFoRwShF5nS2u8+FwveE1Vrw+Gs/HHZb6cn3cx82PYrVXsH+3dfdh1jsa7zxKduqn4ODbDlIJqGnmj8xb8f9Lprcf4b1n5I2l96qDWeopulQZoCgpCA0mhdzI4dWNA9aaCAcpSxWV8OAEJOVusouWsYGLw8B0PrE9wqBZasolh34p9W50mJz7Ye7M0zD9vXuWklpqxhkGVxmhLZ5myTC3gm9xdVRu73WevtqTlCHMtNIcU81bfM2N3/3aANhawuIAtACTUEQ74A5kAIHegTUsSLGSgjC21wiHxdwg26hr6mHom7BGk0oqDCmwPwAOa7xJtlFvjELySyKhu0mJsRZ7zXBZ+g20lS5AtKeEREiW05MLLV8RAhsdgVA4C4x7igtGEYa12Q471vc8dHl7R7MkpODSI1JopCXHesdQf7Si05s9Xk6Hc38ClVf3u+MLc+XegYIWyIVQIKW4kkTtMKHb+10bNmjpSTBC4/UzbqxHLOs5QmB5KjH0AgHDSbLaLk6D72ohaFnZSeKVt/xiBB4LjGuXxhp4F52/iey+z4KUpZhxwhESuNHtGnQnnb7BtNLiMWagayWIPVDxmGDVvOJlW+0xBW2dQdgfn1vSzMWFH+yV30bhVFMY/Upi+SpTHJe7C+0noNlRDJGAOCAOrf9VpjjuAvY1IGhgWOsRAR2BIlVfxbcb4ro3uFCCoHsYVTD7YE3ABdLNS6IOxSD2FEOgzZlpK0/7ShBWhFowr61VOReBFdyBEMQgf7HmlLNyUHIttlSQCynIYVIxtWtRtL6vvPwm3wb+LIySt9xV3nQeFLBofAWqzn26baB7OIE1ENYvsIepsYAtF/4vRXp1YdwGlyusdy581+Tqa5MWyCABXwrzyXQ4rH8BpDuPyfbCrto2sJTPDGu6VUfPUEsJJSGRGym10TrtFjAFgUvEHrbNIoac1noP31YhSyb3kK0VMyECEbyHbq2gNWV70O6K+mlG2i5sTl8EtycZfGT9nzHe849IwND7ZZuhv/4LyT8V8EFFAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/measurements",
-  "Headers": {
-    "Cache-Control": [
-      "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
-    ],
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:40 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "317"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasProcessMeasurementsResource::getHostMeasurements"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_metrics-513_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_metrics-513_1.json
new file mode 100644
index 0000000000..de9a2f6da6
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_metrics-513_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW/aMBT9K5OfW/IFlOUtBVox8VGRtN06TZVJbsCrY0e2w0Qr/vuucdYVpkl7WR+QQu69x8f33nPyQmixpSKHYihFydaNooZJQeIXkjfayGpRg9CaD1m9AeVyMq6DkMRfv52RiglWNdVY0BWHAgM3ShqZS05ikk3T4DEkZ8Rw/bZ8JgvA8Gh8ldxOM7I/IyuaPzV1C0LiknIN+JZhvoDcSGXpwElYAS1uFJSgAOkjoIZcioKqnYXMObIHle1qG1qOb6aTYZKOM6STO1S8ZWoUE2uN6LYCAQ2M8IcFoR/2zv3oPBxkfi/2L+IoeMDSgumnlD3D9SWJI7/juzf3VGEfft3r6nY6/fJ4nyxn4xGWIDm1q+1piVmCNtigLSsAr0Tmi/kYM9ZcrigfOsIp8HJGBV1DkW6oKhD39cZrJZt6gh0g/QvohzAoL/x+WObdAdCoW0TdEtHY7/jHqDfoB/0g7Pn9qAyCbhfjnK6Aazc9zsSTfXwhG2wk1m2MqXXseTmXTXFewLZTSbGWxaqTy8qjNfOo4VR729A7kNHe35h47QC0VwF2OdfnvSAidmr8MCpe4pTe61zPLZinsP9SwSe50q9Ujo4+OvZt9vtz1YLWeiPNvzD9nbu3mrSR0eWMfpfqDtEPciaDjk9eY0evO30MCFrZ5T0eVk0b/UZxNTOnGlVQc5YfLCOtIXfL9HYFw+MVjKwfiKY67DZmBxZijdXOGlw9rj/fGaTRQiKi0MaalNUeYs8CvxXjZHGTWin6KEVY6TvJmwpa0adZMh8lSytCgdIcykYYEvsoddoYmeaUH8SFRierurGy/9NkagUFQ6/YwunNNdbDSP4Qx4G942UN4hRtjzHg6Dz25f+4WrS3hJlUzOxIfGH/OK+Zu+Em9ylxvrkQfPe/muvm2R55mz6OkzR7DA6b+SwFTP7uTxElLqctfsDHD65SSWmGoEx7+iRdXi8Xi+xzgBXI3vwqGS7HSTaZX9uvDl23NocSQ38+LKn9PDnvP53n1kliiROiGtIdCrNCwGmWkv1PaCALZyUHAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/clusters/metrics-513",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "797"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:31 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "61"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_metrics-513_2.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_metrics-513_2.json
new file mode 100644
index 0000000000..aa0e3ed6bc
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_metrics-513_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW/bNhD+KwM/9Mti681vExAMru0WHuw4sJSm6zAEtHSStVCkQFIq3MD/vUdRaWy3HYYBLWADtu7u4fHueR49EZo2lCeQzgTPiryWVBeCk/CJJLXSotxUwJVis6Lag7Q5MVOeT8K//r4iZcGLsi4XnO4YpBi4lUKLRDASkngVeQ8+uSKaqdPytUgBw/PFm+ndKibHK7KjyWNddSAkzChTgE8LzOeQaCFNO3ARlkDTWwkZSMD2EVBBInhK5cFAJgy7BxkfKhPaLm5Xy9k0WsTYTmJR8ZaRlgXPlUFXmppahCel4LlId6HjlIAJieoNvaCn9hjtuS5++g39KLN+l9dLoelz0KE/dr3x1bdrvP9R4/9bjfM7LuVayxpe0VrvI1HLBK5pigt5JaFiRUIj0NdUM6p6gYR0lz9D4wiebxvJ5uXCvyrZnF/62w2048Xpa5jjF+t91x/23KDnT2J3GLrjMPA+4CFpoR6j4hO8fU3CwO279sk9ldjjMwne3K1Wfz7cT7frxRxLcJPyUJnVTPUWlEY2NUUKuH9ys7lZYEbOxI6ymd1uBCxbU05zSCNzN8T9Qo9cirpamn2OxjDyYZKN3ZGfJYMJ0GCQBoMM0YqX+G/BcDLyRp4/dEdB5nmDAcYZ3QFTluqs4I/m5xPZI+uwbq91pXBgCRN12g6nG1Q/EaVDq8Jpp+80vtM2o5zvdeJ0bFWnwyeG4qzlNctw5j/rXMeq0ZE4fyHhD7FTX1o5O/rs2NPsn9+r4rRSe6H/S6cvuUdjYCYyf72m/wj5DtFb7yOTvlFJFzt73B9hgNPSkPd8WRWt1Yk9VYW+NLROl63zVJBYMp1S0D+nYGDMk9dly23M9gxEjtXWR2090p8dNLbRQSIiN/JOwGgPsdee24lxubmNjBRdlCLs1DvB6hI6h4zi6c18ujUi5CjNmai5JqGLUkd7EVFCWSsufCuIsqqN7L925AptpkBjbeDy5grrYS4+8vPA0fZlDOIS7YgxYGjT5uGPuFpwNA0XQhb6QMKx+WO95sYud3ofEfuS2XB2+FHDtfvsjryLHhbTKH7wWmZ+EhyW3/engBKb0xV/wJ+/2EophJ6B1N3py2j7drvZxO896/z6uWQ5XxlL1TTvLA7lhd7cEtS8x+1L8nKXjZXDFrdDFUQHFGWJYKs4IsfPq+nJWU4IAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/clusters/metrics-513",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "899"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "63"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..0c2c5d647e
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmVadSKKNIhwO/sIqDIRLtrYalTUlSHyb+98VKUae02WNuTu49yU1yRIwm3xI5X0e0FxAhB+2VSqWD8ZbxLHwJ4dCIebLj4aax5TEmKcVEMSLxoYl3gmepxJ0udJrQi7pWpxlt2z0grXbYakc6RSYVCIlTwQ80BIEF7ChP5BtN9FwIfZ4lylUig1qBSNdbBjVFQbgj26qlZAfjLHbtGlUQyymIqY64tmWhOhLAtLAEFqHT6jyUGVOXzdBEKpJsIaA/cImQA6GMbBjMLg55MISI6DXIOTvUUUJi0BkXwdr3gvnaRqf6DRMRJh+hZgW09B8z/a2WM6WJ+t6674/nM29YbuUv1uPJbD6opJ5pPYdKvQqoVQGZyhdcadHAM+iPNzWDgsliPqju5B1Zuts7sl1B5s0y8rySVZ5X0tzT6JQMqVK/kW92FzRnUvPdhNL36j9Uqf/H0MxfP9jqJ3bXgldjslt6cJ+3gqtr3LbyYfHRnpMugzykuCIs/4uRY59+AZ27hIcUBgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "414"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:30 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "57"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_1.json
index 8f126d6593..943939b30e 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWVX0vDMBTFv0se9rQ2abt1szBkTB8GOsv0RUUka65dMG1KcjsU2Xc3nfqils2B/6Av6b2n+eWeQ/pElCzvLUmun8jSwB1JyBKxsgmlmdK18ASs/EKXuRYLP9MF5ZWkHBW3dBXS3Oi6sjQeQC8UBzEXCx73g4gPs5hFiwGtjM7AWrCHssxULWCi6xJHaGroVDyHWV2Mgo5EKGwKJnVvRgFjpEsMKEdiQd2R9U2ztLXCF8rMAEcQrhyysO+xyAvjiyBOeoOEhVdOu4GaNg1tXK5pqS2WvADXtTmNF/RUH1eeXXIjPMbc4y9yOHh4O/xmECWg00rxZVUSDljQ7OtEmMoy/ww/ihv8H/GD7on/zpdKGyQvxaZWKZnxc8BZ+2DdN/CxgteO+XF6Mp2Mb8+PJ2ezo/H80pVrC2asJHczIAWgkZn1+kO2kzMrMFbq0imHPvNjsu7+XF6CvfLSovovedmG/015SefT013T0u7Lb6Yl3CstLar/kpZt+H/idml35kNeHCNq5GrzVyNJtH4GMw8VCk4HAAA=",
+  "Body": "H4sIAAAAAAAAANWVXUvDMBSG/0suvLJN+rFuFoaM6cVAZ5neqIjE5rQLpk1JTici++9mm94oxTlwKvQmPectT855oC9EyfrRkvT2hcwNFCQlc8TGppTmSrfCE7DwK12XWjz4ua4obyTlqLili5CWRreNpUkfkhAGRZ8lYZHHA+BRLKK4oI3ROVgL9ljWuWoFjHVb4xBNCwcNL2HaVsPgQCJUNgOTuTfDgDFySAwoR2JBFWR5tzraVuGGMjfAEYQrhyzseSzywsEV66VBL43jG5ddQ01WDV1crmmuLda8Ate1vo0XGRAPpWfn3AiPMff4C/5kivfLrwdRA7qsFN9OpWGfBX2XdSHMZF1+xk9SdrTC38s+6I74H/bSaINkU1zVGiVzfgk47R6s+wY+N/DWMTvNzibj0f3l6fhiejKaXbtya8GMlORuBqQCNDK3Xi+IttrMAoyVunbJgc/8hCwP9+dLsJMvHan/4stX+H/Cl+7N/KYv4U6+dKT+iy9f4f+QL9lscr6tLd17+WSLI0SNXK3/aiSNlq9jeSrBTgcAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "416"
+      "415"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:39 GMT"
+      "Fri, 28 Mar 2025 05:16:21 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "88"
+      "70"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_databases_1.json
similarity index 59%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_databases_1.json
index cb1f4bcc16..19d2db5d68 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_databases_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWRz2rDMAzG38WHnprYSdtkDYQddi+9lx0UW/lDHTvYciiUvPu8lgzKnqCgi4Q+6ftJd6YHc/WsutxZ77BlFeuJJl9xLrUNKlE4p6M1nVVNKu3IYRo4kAbP55x3zobJ86LEfa6OBagGikO2gw9ZiF1T8slZid6jf0qSbK8PNCe+B6cSIWKkTYfH27rhsc0gVXkpspIrIGggyj8HI3VQ+GWDoZpcwM0EHZ7CWGebgXD0Z3TnWKkzIdiWOdQRxKNu2fL9m/qg6Qm5zjzBiLFHWtMOXZS8wxn4n9sXwGX7D0tbCfpdqFazr1Dxb2QJ9OPnrMqXH5PcDmWrAgAA",
+  "Body": "H4sIAAAAAAAAANWRz2rDMAzG38WHnprY+UNSAmGH3UvvYwfVlpMwxw6WnR1K3n1eSwZlT1DQRUKf9P2kGzOT/SLWfdzY6FGzjo0hLNRxLo2LKlO45rOzg1PXXLqZwzJxCAaIryUfvIsL8abFpsSTbkVTalmfEKpaVbXmi3cSiZAekqzyqK5DRiN4lQmRIl/h2+t9w32bxdCVrShariDAFZL8bbLSRIXvLtrQBx/xsMCA5zj3xWEKONMF/SVV+kIIdmQeTQIhNJptn78pRRMekPvMM8yYeqSzehqS5BXOwP/cPgFux39Yxkkwr0K1m32GSn8LLoC5/5x15fYDRcQQSqsCAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/databases",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/processes/atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net:27017/databases",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "261"
+      "260"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:41 GMT"
+      "Fri, 28 Mar 2025 05:16:22 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "31"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_config_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_databases_config_measurements_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_config_measurements_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_databases_config_measurements_1.json
index 32178f6e09..4666d6c9fd 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_config_measurements_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_databases_config_measurements_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAM2VUW+bMBSF/4sf9hSwcRJokKqJJNbGlJGoeF3XaYoMOAkaYIRN1KnKf59x0ymVyh7aNZrEgw33+jvn2MA9yJhiCZM8YiUHPkhFtcm3YAB4lekpRnhsoaGFXeq4/sjzEb7VD7cNq9qCNbn6pYtWdIg+m7uircOuzfX4CGcTl2UJc8fOkF2kLhomni7aCalMDVMFk5YzKsZqb8kdazILIX3ZyZZP7uxSVFuRJVbG93bFlY895HT9RV79lMD/fg92Dd/odXZK1dKHMC1Em5nyY6udihKyOoeGBPcYGoES9qmDdSNSLiWX8CXi4GOUEj6kCEvOZNvwkldKvj/J7NIk9q7mTS6yy5Uzpw7+qL01vNCGJC824DD4/wz+UfhE0RM13e6Cw48BOLVudqsLZyXyx6nKSy4VK+v+Q7ZnRauPJLJRt2D1cD7nAQ2mQUzWwTW5Cj6Q9XL6iczoOg5vie5pq7wDgOk3SmIT4ou53vPc2XKx0MBwGenhl4ieQONZsAiuXkftcdsN3sAjvnA9/DwxpkuT77+HjtDE7bEZRnNy8wZI56+8M+4juaEkouckHt+PMxKvQ/K1l6frjx+h1/wEtL5G9ek7/AYLBVpr1QYAAA==",
+  "Body": "H4sIAAAAAAAAAM2VUW+bMBSF/4sf9hSwMQQypKoiCdqYMhIVr+06TZEDJkEDjGyTaary32doOqVS2UO7RpN4sOFef+ccG7gHGVV0QyWLacWAD1Je58UWjACrMz3FCI8NZBt4QtDYt8a+49zph1tB67akolC/dNGK2Ohzf5e3TdS1uR5zMZvkHnJxnjoTRm0ns51cF+24VH0NVSWVhi1YttkackdFZiCkL3NPf4rcrHi95dnGyNjerJnysYcsT/eXRf1DAv/bPdgJlut1dko10ocwLXmb9eXHVjPlFaRNAXsS3GPYC5RwSB1sBE+ZlEzCl4iDj1FK+JAirBiVrWAVq5W8PMnsok/sXcNEwbOLlTUnFv6ovQlWakOSlTk4jP4/g38UPlH0RE23u+DwfQROrfe71YWz4sXjVBUVk4pWzfAh29Oy1UcSmahbsH44n/OABNMgCdfBdXgVfAjXy+mncEbWSXQX6p62LjoAmH4lYdKH+GKu9zx3tlwsNDBaxnr4JSYn0GQWLIKr11EH3HaDN/CIJ66HnycmZNnn+++hDnrvDtiM4nl4+wZI66+8M+5jeEvCmJyTeHw/zki8jsKbQZ6uP36EXvMT0PqEGtJ3+A1vR9eP1QYAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/databases/config/measurements",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/processes/atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net:27017/databases/config/measurements",
   "Headers": {
     "Cache-Control": [
       "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
@@ -17,7 +17,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:41 GMT"
+      "Fri, 28 Mar 2025 05:16:23 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "323"
+      "160"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_disks_1.json
similarity index 60%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_disks_1.json
index bd2ad43c85..f5a3ddb05b 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_disks_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAM2QsW7DMAxE/0VDptqSnMRuDBgZugfZiw60xdhCZEkQqaBAkH+v46BTf6AAl+PxcHi8C2f9lUT7eRdTwotoxcQcqZVycCGbwuCtnIMfg+nLIcwSopXADkjeKjmmkCPJusFdZQ41mB7qvd7C+1Crbd/ImMKAREivSKF3bs+3giZIplBqmbIf8fD927C2eeS2apRupLF0paP1g8sGP0L23HHKuIkw4inPnd5YxpnOmM7LptNKiTeR0C0QhO4iHl9PSdnxC/C/o0oDDH8RIiS2bIM/wYyLsV49DQ4Mbv2LaPXjB8hf/AzLAQAA",
+  "Body": "H4sIAAAAAAAAAM2QvW7DMAyE30VDptqSf2AHBowO3YPsRQfGohwhsiSIlDsEefc6Djr1BQpwOR4Ph4934ay/kRg+7+Ka0IhBXJkjDVJOLmRdaFzLJfg56Es5hUVCtBLYAcm1lnMKOZLseuxqPJpedbWZ2iNC0+qmNTKmMCER0itSNAn1ZS7oCkkXSm1TrvCdzG/D3uaRh7pXVS+1pRu9Wz+5rPEjZM8jp4yHCDOe8jJWB8u40BnTeduMlVLiTSR0GwShM+Lx9ZSUHb8A/zuq1MDwFyFCYss2+BMsuBn71dPgwOD2v4ihevwARPwXl8sBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/disks",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/processes/atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net:27017/disks",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "243"
+      "242"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:42 GMT"
+      "Fri, 28 Mar 2025 05:16:24 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "137"
+      "71"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_disks_data_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_disks_data_measurements_1.json
new file mode 100644
index 0000000000..1bf07c52d3
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_disks_data_measurements_1.json
@@ -0,0 +1,56 @@
+{
+  "Body": "H4sIAAAAAAAAAM2XXW/aMBSG/0sudlUS+/jrGGmaGGQrGoUMgvalCaWNaaNBgpLQaar632fSbgI6oCvNNCu5SGI7z3mPfd7kxjFp7DQdICAahDUAQyKaVDSBf3ZOnMs8SpezKE/KH7ZTEDJyVt3NlovuaphURoLBqSISphccTcR4zPjUdrrKirLqE5WzqGiw3MTnl43iKsrjBiH2cK+j7/nUnWfpZRafN2Jz7aambIIiVNnxsyT9VjjNLzfOVW6mdp6rslwUTc+7mGXLuOp+P9S9yOZetEi86k3eNXgVYOHtovMWeXZhisIU3lPgvDgpvhVeHJWRNzdRsczN3KRl8WpNrZeVVi8WJk+y+GVAOyGFUxtVbmY2lMLMps7tyf8X2m/CDaINmlVenduvJ8566FWeVoIEWfLrskzmpiij+WL38rqOZkvjNInLCEoKlCBSwQXCav40mttnTqc7ejcJWsOwG3YH/Ul3EIwmQ7/VscOXabJ6lzNqt3qt4STwh5OR3x70O5W2T8YBF4ELDRQZCOCa8gM4H4bd0K+Ph7mUMSAcNBCpNNfiAE84CFu9OvWxMFIhkyAUI1rvxum1Qr/f/rSdsLNur9e9Qxkdx0JcFEoiRSIolZwCHobZTtfz0VCQ3CVKUK0UQQu0hyY8HQ7Gb0+DcbitzutPoT96tmxR0BSlS7mQArkG2JOuNaZtkZ4XClylJZFcEy7YqvmU7MYaBa22P3kz9B8AHUfBrSpScSSKy6oJf484dxTjkf8gV8dRoHIJciUUolit4EMENgdtvx9u63F/+9jF4mpqax5QyplAJHtK3ybNli7PQkNcQhilWtu9LbSyWxwZ2wZ6P/bH/qTjB+Hpg5J3bN1FYFKiFqCVtuf6bj5rfZz8e2tC4lp7lMyaEnAESR9BVLM7SYtk7dLWF865UnLDnXYx1exQyuUbje1Hqt2l7BcF5WvHAYnqNyoLRBhKCXYNVY1vFuA/QNVZhBElcqbYnRXox4DUUocZKMWENQQJIB+FUXcxth+hXBJkytZjLv+GaFdBtlMsorxMyiRL+3dzrQht1/tfh2N+2mxgebkrsNufRmPTEW0OAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/processes/atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net:27017/disks/data/measurements",
+  "Headers": {
+    "Cache-Control": [
+      "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
+    ],
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "818"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:24 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "117"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasProcessMeasurementsResource::getSpecificDiskMeasurements"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_measurements_1.json
new file mode 100644
index 0000000000..e7ce5931cc
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_measurements_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAM2cbW/iSBLHvwsv9tXE9HO3I61OjmmIL8Zm/TCZzOlksRMyE12eBGRWq9V89y0bJsEGh1zibhaNPEow/lVXV/27ym7yV292d9k77hFE+BGiR0RliB9jcYzE596H3tf59O7xZjq/Xv4JJ00yisbVb+8fH4LyY0LOBJmpK4kEufrC1GxK2SVlV3DSt/vFsjpnuryZLo7ofHb5+9ejxbfp/PIIIfjnfJ/+Mb9ybu/vvt5f/n50Ofvu3M2Wx0QiLOHzN9d3/1v0jv/zV+/bfHYF1/m2XD4sjvv9Lzf3j5fV6euPOl/ub/vTh+t+Rep/J/3KwEW/zbr+w/z+y2yxmC36bzGufzubLh7ns9vZ3XLxrw0X/Vo56JeH2fz6/vLXCR5kmJzCUOazG7B/Mbu56v348M8bz5OFNYtq1pST2fvx3w+9zaFXk3M5XU4n99c/f1xe384Wy+ntQ3tMfZ/ePM56x+C0m/KKd9Nb+KnnpalOsiLRozz0Ejjt8e66vGYv9T34RTHRSZFqP44GlQ87xp57SRREI9vYcWodmcPRGtP3/FNdnFxkOoWZ9QZFEGXxBn31jgX4eRJkmY6KYRKPjfEJlkIQB23ZMAiS7GJlSRP+TiJTCuEdRJjlgQkgchATlBHpSi4lVRhTtgUfBmFYJF4WbE41ONnXUfZ+POKAR0IxiV2kxAZ95WZzdNbwdBxF2gdOlG4l1LuHucnJkzRO0iKLMy8s4omOOsY186bGy4IxhFKcZ+ZEg1DKZD1vBidFmsWJN9IrMzpOG0kFbfIGXuYVafDZCBHtoRXncZFepJneUicTrg2igf5kbKyNcBrEfj6G3CvGOksCv1wIsjyJ9MDaKrRlQRCVS+EhLcgnEACHNGCgQ23TAP0pSzxw/DAuJmVWD708zLZ1szN8PeFGYXwCSRbG/lkB8paUnvgt1/l2/Hcv3+3ssiLSidnFo51elkTd0wmu88d6HCcXMNQ0GJQL8DNtrEdeB2rDiMt2ET9CMZDXprYjYCOw17ixN5nU0skMLdLZeZycravaIGoqt6n0rXPr1YAVcJSPIYggclOTqtGAxxM/ziPIksIf25PKZyoMN7k4AHe1Oh0AvFqVDgDOstD6kvhMH+kMROQQ415VQgcAJ3oSHiirKvTBQryiHyzOK7r1SddVOx6lBYCiwougn0wGFm9DbVhQSmoAy9VZEIZWc73Qn7Sfl0ZULXVV/G2uZGMwKFiRuy0ZttFV5Xcgth+Px15kaOT10jOehPGoSEPvoy5CbwQlWlpJPZixOe+mwGWqBX4VdhXeBJdwR/ItssGBYunQ2ou00X8OuRgEw6EBfyOCEJLo+bVtCeS8LkYnVU6fxvmm3oyCdXX+/GaXcV8VbuvQj5NK9mze8NiNL+KTf2vfYvm8MiPzEqhvgmj0ZMekWohabgJZsWDtCZOW1JvSLPDPNAC9j14Qeifhtv7bYFbCb/R2w9NKW2SnSQxVden1RJfeLt3+tA5bjsF0Uj4UyGIQo/SsGORJFQxxp0UQPyZsww5KHYKZQkRwKRgicsOoSRL7Ok0Lf5I3n8e97UFFg40cgFImJSKKCaVqa8Qm/ExD5Ifd41ELzz8NwkGiI0Oj3os1M14sHIEkQ5gSpQj8t8vdUZyMvTD4DGlgbtrBACGp4pgRyhiVbL8hNkOggT5ANLRZYMYLEjsEcaYYlkphWdOAsfepMK0DFHQAE6QEHBBmkr9kgI1AaDItRkAr2sy4KQdNIJKB910GM0BFiy0WdAE7inCBGEWirJmpdF9ni+2IOJw8vMaK13vj+brDssZcX/fnI5Bi9cRg/zPX3ZdZP9d451XSUy+BAb7tIlURlafeSL8V//9EevsV3jsjb0y9V13MkKoIRynOOXG5i4R01UYMr7YPGFxLCKcUE4UYEoQKTHezbYjGBi4KfN01DNooJssNRuBpJiRp8XIQn3tBZm2kQfJb9yyJKaWuEJxTprgrd6PTeJgZwbcMdVQ+5uuaxiGCKeYCu1AUUc5bhpppr/sGQTmMEQl9oHQhiVx3m22lDBAEZrpsRhHFWKEds32ACmA32UReEwcRqqA1kvCiVLC9VlhM8SbZRLpRLoRwFSVSQGXq1jZP7jbDZuY30EZEgECrjrlUyC1LYil3qEDTA0YEody8KpnDJGKi3ES7KxXXOx+63OTR9IbEouwRJbQnoAu7ZGltRKc7Pl4OhnNvAnlXH3bH9+Z2E7vd49qcccRAfpmCPtx1Vf1pRdl9GK7eCHIUqD+VdH3k7XxbbZ/hKk5yB2MGK70Sq2M73obMN5Hdiyp3XNclHEm2PrbTrch6g2lEzzHGDqKIulgiV1KXvxDXRpScEweaIoYQAudDcu/G26jukMMopljBelIdWxTmQPd47FV5VDqcy7I7pqQ6vsoSyxJgvtojpRoI6NklWx2b934PWPC14810ftzhmGOXK86UcOUrPWGk8HO4UC6UWrrNCPNVH5fwPq5vHNlhgb2Sr4JbKPvIjjHbqP0YLEuK72p51pvHy2/rbeDPgjB+y9bxZqyV3b6iL3CfdgZ0DycKK6VeYA8TbQArlHiBubrrbcDT8EIKv0CuvhhpgEwoIS9gT/LhsP4dj464VLHtHqp6JGAomBl2ocgTbVAz0YSFBLEmbWuX2eylUMRTdw/bYAZTLnDzyzxbfDN+l0ru4ZrLZCkIwXvoxrLZpWIP2lpGP62OhrOaIfYiuD3C4CPrv3vxnj8zAobOl22G/vgbDZdy4R9FAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/processes/atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net:27017/measurements",
+  "Headers": {
+    "Cache-Control": [
+      "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
+    ],
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:21 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "92"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasProcessMeasurementsResource::getHostMeasurements"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_2.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_measurements_2.json
similarity index 57%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_2.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_measurements_2.json
index 23a9d1dd33..4ce7818cf8 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_2.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_processes_atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net_27017_measurements_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAM2SXUvDMBSG/0sudrU26VfqCkNkFvRiWrYORJGRNtlaTJuSpEMZ+++mYcoG7kZvhHOT5LznPOfN2QPWUpAAH/mRgwLHx7mHk9BE+AzGYCtJ23Mia/1hkrI8QHN7K/rufpDhmIU+nWBCC4IjLyBXJUZBEZukSihtc4jmRDleyCO9c1RFJHUQMuEWWzZ5dxvRbgUtHMp2bst04sfIG/S8bt8USF72oJJsY+pUWncqgbDkoqc2/Sh1S9FA0tXQdoI7H1pABS/RwU6KkinFFPwNHGwYUb1kDWu1uj6xaGoNGjXT+c3TOls8ztLlcj3LVuvVMl2MOiZrQaeZd5t7/p2ZUDJuxlKMb8Bh/P/G/CY8IzqjGf4YHF7H4NQR+2eUaJKJ+uuo64YpTZru8qrtCO8ZSDByYxTgAEVxjHwPD9Vb0pgX8JOrRti39dAFZOlilj7kluc4+V/2z+BKfQn38Al1jH6ZOAMAAA==",
+  "Body": "H4sIAAAAAAAAAM2SUWuDMBDHv0se+lRNjFpFKGN0wvbQTVoLY2OU1JxVpkaS6Bij331RutHC+rK9DPKS5P53v/vffSBoOIoQJdS3iGvRMCV+5PgR9Z7QFO0la7qKyVK/m6AkdclyfBVdezfIZgHMKIR5QGY0z7wQmOtx18tNUCGUHmOYrpiyXAl8t7dUwSS3CDHH7tmbzO1aNHvBdxaH3m5ARzQgTmD0Vdm8KhQ9f6BCQm7yFFq3KsI4q0THx/Cj1M5EjVlb4rES7ikeARW+RIdbKTJQChT+DRyugalOQg2NVlcnFs1Hgyb1fHn9uE1WD4t4vd4uks12s45XkxZkKfg8cW5Sh96aDiVUpi0FVY4O0//X5jfhGdEZzTBjdHiZolNHxplxplkiyq+rLmtQmtXt5VXrWdUBigLHpsT3Qs8JwtAJaDCkb1htvtBPthpl15RDGZTEq0V8n45Ax9b/soCGV+pLvIdPgqGQHjkDAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/measurements",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/processes/atlas-3redbg-shard-00-00.vawrf.mongodb-dev.net:27017/measurements",
   "Headers": {
     "Cache-Control": [
       "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
@@ -11,13 +11,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "367"
+      "368"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:40 GMT"
+      "Fri, 28 Mar 2025 05:16:22 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "162"
+      "58"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 0676aab443..244daf5310 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:48 GMT"
+      "Fri, 28 Mar 2025 05:07:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_1.json
index f184f1f3a7..29464b66d5 100644
--- a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMSAoV47dW+XVh0O+yBWDEY+kw4R/16iqGlZKhbme3r3pNNdmXYTRQzPfhoiU1nCdECIaJhiIhNlmuWpkK9HqfJaFdU7S5i9zWSFhTBPEkwDsjzmUGuZ5U21zJ0dzsTUx5WdArYLe4pxJMW5dn4yqcHLofdD501z0L7nMFoO0QHxi+Bd8NNI/B97QLcoCV3L5mSHFVz7IYIdMNBj28q+Mv+Bd6q5n2dTyw+6T4mBCA0QvtG2nDW/T9OI21ru3E4NwWskwk0dD3aflq+TjegsxQ0tv+z8mbABelzwHmOwmlIUmNZ5uWh86F5uD19ia0DWAvJWoBFYGSO1wYLN3wc0QtJEBAAA",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxJYBQ7126t4urTo49plYMTbymXSI+PcSRU3LUrEw39O7J53uSrSfMEN6jlPIRLKC6AQqgyGScMabklUl715ZI1kr+dM7KYi7zUQLgkNnWya41XUHqqpNVdtl7l04I5EfV3JKYBf2lPOIklLt42RKA5fDEEMfzfGg40DV6KjKXiG9cNqnOI1I/7En8IsSwVsyFzusoDqGrFyAhI9tK/vK/AfeqeZ+nk0tP+g+JUZldVQIb7gtZ83v0zTCtpY7t1NDihoQYVPHg92n5evkMniHeUPLLzt/FiSoARZ8gJycxhI4lIK1iyam/uX28A1Yo0THVWU5GA6tMUIbqMn8DYKTgu5EBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:46 GMT"
+      "Fri, 28 Mar 2025 05:07:27 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1463"
+      "2065"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_1.json b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_1.json
deleted file mode 100644
index a6b7dea6d4..0000000000
--- a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXVxYzl6U2w3cOFLYCnNNotFQIljmxuKFEjKhRv43zs01a7tYhf70j4YkDWcM4czc47eCGU7KitgIyXXfNNqarmSJH0jVWusqpcNSGPEiDdb0P5MIUwUk/TPv65IzSWv23oiaSmAYeBBK6sqJUhKilkevcTkilhhTtPnigGGx5MP2eOsIIcrUtLqtW06EJKuqTCAbzmel1BZpR0duAhroOxBwxo0IH0ENFApyajeO8hKIHvQxb5xodXkYTYdZfmkQDqVR8Vb5lZzuTGI7jIQ0MIYf5gQh/HNddi/jgdFNEj7w/T97TOmMm5ec/4V7u9I2g97oX/zRDX24fu9PjzOZp9fnrLVfDLGFCSn942rltkVGIsN2nEGeCWyWC4meGIjVEnFyBPOQaznVNINsHxLNUPcHzfeaNU2U+wAGSTwPma3A8pKOriJ+nRYDcJ+mSAaP4nf3iZJGSfJYJ3Q5GYYrzEuaAnC+OkJLl/d4xvZYiMxb2ttY9IgqIRq2TWDXa9WcqNY2atUHdCGB9QKaoJdHBzJmODfmATdAExQA3a5Mtc3w5C4qYnjqMQap/S76gZ+wQKN/VcaPqrS/KByVvqs7Onp38/VSNqYrbL/h+k/Zw9Oky4yvpvTv5X+hOhHOZNhz7W/i5297g0wIGntlvd8WA1tzYniGm4vNaqhEbw6WkbeQOWX6XQFh+crGDFXq62Pu42nIwexwWxvDT4f11/sLdLoIBFRGutMymkPsedR2IlxunzInRRDlCKU5pMSbQ2d6PMiW4yzlROhRGmOVCstSUOUOm2tyisqjuJCo1N10zrZ/2wyjQbG0St2cHlzg/kwVl/keeDgeTmDuEQ7YAwEOo97+Suu1j84wlxpbvckTdwf7zULP9zsKSfeN5dS7H9Vc/08u5KP+csky4uX6LiZX5WE6X/4k/Mvd6ZLfsbHdz5TK2VHoG1XfZqv7lfLZfFHhBnI3n5PGa0mWTFd3LuvDjhXPq6m+yh5x7+c4s4LYYVzoQbyPcqxRphZkZPDN1hcVnQbBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "795"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:48 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "544"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_1.json b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_1.json
new file mode 100644
index 0000000000..ad635b76c4
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e62e8f7062fc48ea34d34f_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227iMBD9lZWfW3IDyuYtBVqx4lKRtN3talWZZALeOnZkO6xoxb/vGNMLrCrtS/uAFDIzx8czc06eCC3WVORQ9KUo2bJR1DApSPxE8kYbWc1qEFrzPqtXoFxOxnUQkvjnrxNSMcGqphoKuuBQYOBKSSNzyUlMsnEa3IfkhBiu35ZPZAEYHgwvkutxRrYnZEHzh6beg5C4pFwDvmWYLyA3Ulk6cBRWQIsrBSUoQPoIqCGXoqBqYyFzjuxBZZvahubDq/Gon6TDDOnkDhVvmRrFxFIjuq1AQAMD/GFB6IedUz86DXuZ34n9szgK7rC0YPohZY9weU7iyG/57s0tVdiH53tdXI/HP+5vk/lkOMASJKc2tT0tMXPQBhu0ZgXglch0Nh1ixpLLBeV9RzgFXk6ooEso0hVVBeK+3HipZFOPsAOkewbdEHrlmd8Ny7zdAxq1i6hdIhp7jX+NOr1u0A3Cjt+NyiBotzHO6QK4dtPjTDzYxyeywkZi3cqYWseel3PZFKcFrFuVFEtZLFq5rDxaM48aTrW3Dr0dGe29x8TbD0B7FWCXc33aCSJip8Z3o+IlTumzzvXcgnkK+y8VfJML/ULl4OiDY99mfz5XLWitV9L8D9PX3K3VpI0Mzif0t1Q3iL6TM+m1fPISO3jd6mJA0Mou7+GwatroN4qrmTnWqIKas3xnGWkNuVumtysYHq5gZP1ANNVutzE7sBBLrHbW4Opx/fnGII09JCIKbaxJWe0h9iTw92Icza5SK0UfpQgLfSN5U8Fe9GmWTAfJ3IpQoDT7shGGxD5KnTZGpjnlO3Gh0cmqbqzs/zWZWkHB0CvWcHxzjfUwkH/EYWDreFmDOEbbYgw4Oo99+RFXi7aWMJOKmQ2Jz+wf5zVTN9zkNiXON2eCbz6quW6e+yOv0/thkmb3wW4zH6WA0fv+FFHicvbFd/j4xVUqKU0flNmfPkrnl/PZLPseYAWyN88l/fkwyUbTS/vVAevKu9W0HyXn+MdTXDshzHEuVEO6QTlWCDPOUrL9C/OSSBcbBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e8f7062fc48ea34d34f/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "792"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:30 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "505"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/memory.json b/test/e2e/.snapshots/TestMetrics/memory.json
index 10118faa16..626c8a5e3a 100644
--- a/test/e2e/.snapshots/TestMetrics/memory.json
+++ b/test/e2e/.snapshots/TestMetrics/memory.json
@@ -1 +1 @@
-{"metricsGenerateClusterName":"metrics-580"}
\ No newline at end of file
+{"metricsGenerateClusterName":"metrics-513"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json b/test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
similarity index 77%
rename from test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
index 1bd5882805..2010108759 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 200,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561/onlineArchives/67e630af7062fc48ea34eabf",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:01 GMT"
+      "Fri, 28 Mar 2025 05:16:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "222"
+      "206"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_1.json
deleted file mode 100644
index 75807668da..0000000000
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV227bOBD9lQWfE+vi2kr0pthu4IUvgaU0uy0WAUWNbTYUKZCUCzfwv3doqrm4F+xL2wcDModz5pAz5/CR0GpHJYNqpOSab1pNLVeSpI+EtcaqetmANEaMeLMF7fcUwkQxST/8d0ZqLnnd1hNJSwEVBm60soopQVJSzPLoPiZnxArzMn2uKsDwePI2u50V5HBGSsoe2qYDIemaCgO4ynG/BGaVdnTgJKyBVjca1qAB6SOgAaZkRfXeQTKB7EEX+8aFVpOb2XSU5ZMC6TCPiqfMreZyYxDdZSCghTH+MCEO48F52D+Ph0U0TPtJOojfY2rFzUPOP8P1FUn7YS/0K3dU4z18Pdfb29ns3/u7bDWfjDEFyel946pldgXG4gXteAV4JLJYLia4YyNUScXIE85BrOdU0g1U+ZbqCnGfTrzRqm2meANkmMCbuBowWpV0OIj69IIN1pfDNaLx5/gwvEySMk6S4TqhySCKIowLWoIwvnuCywf3+Ui2eJGYt7W2MWkQMKHa6ryCXa9WcqOqssdUHdCGB9QKaoJdHBzJmOBHTIKuASZQEstAptmW78CcDy76xDVPHDsm1tis31w+8OMWaOyG0vC3Ks0To1cMXlV/ufuPUTaSNmar7P8h/Lz34ITqIuOrOf2o9DssctQ4ueiF5Cn2ark3xICktZvo73awoa15ocaG21P9amgEZ0c7yRtgftB+Mp6hG0/Z1se5x92Rg9hgtrcNn4/SEHvLmekgEVEa6wzM6RKx51HYCXW6vMmdTEOUKZTmnRJtDZ0h5EW2GGcrJ1CJsh2pVlqShmgDtLUqZ1QchYcmqOqmdZbwrQE1GiqOPrKD05MbzIex+iRfBw6elzOPU7QDxkCgK7nFX3G0/sER5kpzuydp4v54H1r4Hmd3OfGeupRi/6su1/ezK3mb30+yvLiPjgP6WUmY/mQ4Lonf0yW/x8+/fKZWyo5A2676NF9dr5bL4h83Tsjefk0ZrSZZMV1cuxeJbjoLRMGhdx+H1D1d/l047efOK2OFHaIG8j3KtEbAWZGTwxeMhbNwQQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "802"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:53 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_2.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_2.json
deleted file mode 100644
index 4725fc7fe5..0000000000
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV728aORD9V07+0C8X2B8cbLJSdKJAK04QInbTXFudIuMdwBevvWd7qWjE/37j9aZJaC6qTmorgQQ7M8+z8+Y93xFa7KhkUIyUXPNNranlSpL0jrDaWFUuKpDGiBGvtqB9Ti5MFJP0418npOSSl3U5kXQloMDApVZWMSVISvJZFt3E5IRYYR6Xz1UBGB5P3gyvZjk5nJAVZbd11YKQdE2FAXzKMV8Cs0q7duAorIEWlxrWoAHbR0ADTMmC6r2DZAK7B53vKxdaTi5n09Ewm+TYDvOo+JaZ1VxujEM3lrpahCelkhtVrNIgUFJwCVSzLd+B6fRPex2zxaROGOKnO5DVp7jbpncK2HUl2DROwig5ebE0+v+l8Uulwe/I1LnVNbyitd1mqtYMzmmBLL3SUAnOaAb2nFpBTafah/+o/j00zuV+BJnePUzhV6N3z07i+T6a0SMzFsb4RZg4jPudsNeJB3k0SHtJ2o8/4FkFN7cZ/wxvX5O0F3ZD/+Saamz1fkHeXM1m72+uh8v5ZIwlyLLeV462oV2CsbhpO14A7ga5WFxMMGMj1IqKkWc+A7GeU0k3UGTuFRH3y+pstKqrqeN6kMBvcdFntFjRQT/q0VPWX58N1ojGH+KD8CxJVnGSDNYJTfpRFGFc0BUI42WAw7l1P+/IFjcS67bWVgbnxoSqi2Y47aC6TJUBrXjQkBDs4qBpxgT/1UnQbrJpORg+4oA4FYhm9cUaR/+Djw+8bgONbCgNf6iV+dLRkw6enP44+6e1bCStzFbZb2n4IffgHM9Fxq/n9G+l3+EhjVmS065TUBt78rg7wICkpdvoZxmsaG0e2VrF7bERttJtHKsC5hfthfUM3XrKumz2HrMjB7HBau+/vh6lIfaWM9NCIqJ0DsDA6RKx51HYCnW6uMycTEOUKazMOyXqElpnzfLhxXi4dAKVKNuRqqUlaYg2gA6kMkZFIzy8TVRZ1c4SvnbySkPB0ZB3cPzmButhrD7Jp4GD78uZxzHaAWMg0N7dw+/xar2Da5grze2epIn7433ownM8vM6Iv5wWUuy/13A9n+2RV9nNZJjlN1GzoJ+VhOkLy3FGfE5b/AF//uIrtVJ2BNq2p0+z5dvlYpH/GfnLwd6XTMczZ7eWblr7Q7GhbzcL6u5/f7kec7nzqlgiO9RAtkeJlgg2yzNy+BdxTIk6hggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "907"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:57 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "73"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_1.json
new file mode 100644
index 0000000000..b6d0ecae52
--- /dev/null
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfW/JBCShvKdCKiS+RtN06TZVJLuDVsSPbYaIV/33XOO1atlV76faAFHx9zz32vef4kdBiS0UORV+KFVvXihomBYkfSV5rI8tZBUJr3mfVBpTbk3EdhCT+8vWElEywsi6Hgi45FBiYK2lkLjmJSTZOg7uQnBDD9cv0iSwAw4PhRXI1zsj+hCxpfl9XDQiJV5RrwFWG+wXkRipLB47CCmgxV7ACBUgfATXkUhRU7SxkzpE9qGxX2dBiOB+P+kk6zJBO7lDxlKlRTKw1otsMBDQwwB8mhH7YOfXbp2Ev8zux341D/xZTC6bvU/YAl+ckbvst363cUIX38HSui6vx+PPdTbKYDAeYguTUrrLVErMAbfCCtqwAPBKZzqZD3LHmckl53xFOga8mVNA1FOmGqgJxn0+8VrKuRngDJOpCFEIv6vSiIArCjh+1Vz4EZ4jGXsR7XT8KV/lZD2j7rAhWS4xzugSuXfc4E/f285Fs8CIxb2NMpWPPy7msi9MCtq1SirUslq1clh6tmEcNp9rbht6BjPb+xMRrGqA9KbAMJCrfsC3o004UENs8fugYX2Gz/nF5z42bp7AbUsFHudTPjF4xeFX95e7/RlkLWumNNH9D+OfevRWqjQzOJ/SbVNdY5KBx0mv55Dn2arkVYUDQ0k70bztY0Vq/UGPFzLF+FVSc5Qc7SSvI3aC9MZ5gx1PU5WHucXdgIdaY7WzD5aM0+M6wXDeQiCi0sQZmdYnYk8BvhDqazVMrUx9lCkt9LXldQmMIaZZMB8nCClSgbPuyFobEPtoArY1Mc8oPwkMTlGVVW0v41YAqBQVDH9nC8ck15sNAfhevA3vHy5rHMdoeY8DRleziexytvbeEmVTM7EjctX+cD01dj5OblDhPnQm+e6/Ldf1sSl6ld8Mkze6Cw4A+SAGjN7yrTdyeJvkWPz+4TCWl6YMyTfVRurhczGbZJzulyN48pfQXwyQbTS/ti0TXjQWi4NC7D0Nqny73Lhz3c+uUscAOUQ3pDmVaIuA4S8n+BzRhLW5BBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "798"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:21 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "74"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_2.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_2.json
new file mode 100644
index 0000000000..65f993816d
--- /dev/null
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVbW/aSBD+K6f90C8X8Avh5SxFJxdoxQlChJ2m11MVLfYA26x33d21Kxrx3zvrdVpCc9HppLYSSOCZeXY8zzzP3hOa11RkkI+l2LBtpahhUpDonmSVNrJYliC05mNW7kC5nJTrICTRP+/PSMEEK6piKuiaQ46BKyWNzCQnEUnnSXAbkjNiuD4uX8gcMDyZvoqv5yk5nJE1ze6qsgUh0YZyDfiUYb6AzEhl24GTsAKaXynYgAJsHwE1ZFLkVO0tZMaxe1DpvrSh1fRqPhvHyTTFdjKHim+ZGMXEVlt0baitRXhSSLGV+TryPCk4E0BVtmM16E5/EHT0DpM6vo+fbilH9adum97Joe4KMFE49IPh2bOlwf8vDZ8r9f5Epi6MquAFrcwukZXK4ILmyNILBSVnGU3AXFDDqe58/Lj7o6IP0DiXhxEkqv42hd+1qp+cxNN9NKNHZgxM8IswoR/2O36vE45Svx/5wyj03+FZOdN3CfsMr1+SqOd3fffkhips9WFBXl3P53/f3sSrxXSCJciy2peWttisQBvctJrlgLtBLpeXU8zYcrmmfOyYT4BvFlTQLeSJfUXE/bo6WyWrcma5HgxhEMJo0B8NgkEQ9v1Bb+NDcI5o7Cg+GvqDcJOdj4D2zvNgs8Y4p2vg2skAh3Nnf96THW4k1u2MKTXOLeOyypvhtIPqZrLwaMm8hgSvDr2mGe39Wydeu8m65SA+4oBYFfBm9fkGR/+Tj/ecbj2FbEgFf8m1/trRow4enX6c/cta1oKWeifNf2n4W+7BOp6NTF4u6Aep3uAhjVmSUdcqqI09etwdYEDQwm70kwyWtNJHtlYyc2qErXQbxyohc4v2zHqCXU9RFc3eY3ZgIbZY7fzX1aM0+N6wTLeQiCisA2RgdYnYi8BvhTpbXiVWpj7KFNb6jeRVAa2zJml8OYlXVqACZTuWlTAk8tEG0IFkklHeCA9vE1mUlbWE7528VJAzNOQaTt9cYz1M5CfxOHBwfVnzOEU7YAw42rt9+CNerXewDTOpmNmTaGj/OB+6dBzHNwlxl9NS8P2PGq7jsz3yOrmdxkl6GzQL+lkKmD3jXT3ictrid/jzN1eppDRjUKY9fZasXq+Wy/Rt4C4H81Aym8yt3Rq6be0PxYa+3Syovf/d5XrKZe1UsUJ2qIZkjxItEGyeJuTwBYQjJ3yGCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "906"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:30 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "61"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_1.json
similarity index 51%
rename from test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_1.json
index d00ee4ae84..6367e7ac2f 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAG1SXWvbQBD8L/eQJyey5NqyBaaIyimGoJhIoQ+hmJNuzz560on7MAnG/z17J7clTd90s7O7Mzs6Eyn6X4ZkL2dy1MBJRo7WDiaLolYqx24ZnO461R8Ua+5a1UV0EBG1kprolEQHrdxgokUKXxI2bylr6GIez+iynfPVguMIZyxoE6ke10Cu26M4gbmdL2f/QF9Fj2QG35Tr7dpqBzcDPUDpunV8Iyx0Zgd6h8g6nk7JhGiQKNWA5OTy0z+Nk3a0sRcMS0ETXyarNG2SNF3wlKbLpFlh71VVSTtA4mdpnqKkvNYtGHtFoLVC9fXb4PGqzssifyp8TaNCLSjJzoRRC/cCJPvbGiClO2oR21aPRV5vEIbXQWjIObYW9A21zybEjrMD4xI66U6rFox5ggPu9htCLoieBAON5PxHFQ4y1slztd/kVb2Pw4Dmo4sQ2PbPff6TGZIGqq3wToOP8ajcf36cFaDxGL2TckKUDoKmPpCBOgO4h1NpYEJMewTmJHj9vz1u7vPnh9qrNBYvhNBuUxbb8ntI1CpLZfgbSBZf3gGcGa1jpwIAAA==",
+  "Body": "H4sIAAAAAAAAAG1SXWvjMBD8L3roU1rb+XCDIRzmnB6Bwxdqlz6UIyj2KhEnW0ZahZaQ/96VnHK0d2/W7OzuzI7PTMn+j2XZy5kdDQiWsSPiYLMoapR27W0Lp7tO9wfd7u8a3UV8kBFHxW10mkYHo91go/Qe0iks08UyTdJkuojTmYghmdMIZxGMjXRPayA3zVGewN4u0uQL9E32RG7hu3Y9rtA4uBn4AUrXrZIbidDZLZgtIaskjtmEGVAk1YIS7PLbP61TONrYyZZKXtMs5uI+TqeimS+Bz+bA94J6r6pK3gER/5XmKVqpax3B4hWBBqXu67fB41Wdl0X+WPiaIYVGcpadWcsRHiSo9m9rgLTpOBK2qX4Veb0mGF4HaSAX1FrwN9I+mzAcZwfGJXTyrdENWPsIB9rtN4RcCD3JFgyR8+cqHGSss6dqt86repeEAfvPLkJgm4/7/C8zIg3coPROg4/xqMJ/fp4VoPEYvVNqwrQJgmIfyMCdBdojuLIwYbY5QusUeP0fHtcP+dPP2qu0SBciaLsui035IySKGrkKfwPLkss7xLEsrqcCAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561/onlineArchives",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "433"
+      "431"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:59 GMT"
+      "Fri, 28 Mar 2025 05:16:32 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "45"
+      "30"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
index d557107ff6..68e1366abf 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWQ0WvCMBDG/5c8dzDr2lTfAq2jMDqxlT2MIWly0UBsSpLKRPzfl0S34dvxu+++++4uaCc5WqIcw0sqinSBcZ9inAtMcZH2C5QgpibrwDT0CF6oByUHIIYd5AnsU1bMg0Qrde87sO5OgDmph+48Bt52pCnJpgw9I72fpGh5QZw6WElQ/H80Im2O1HlWt+8l6SqP4XuUBojwoyU9W7ScJ8jdvKPiGifp2mgG1m5g73eHDUzpiXt6khyMF5OP1ruZex9t211F2m43iwb94xV7o6ex/vsPzxjlPc2z2ZwWLBOLXHjRSI2T4dJ4hw/2eUEilI9eEd2eMUxKJUibGOj5+hU8Jgt+j6DKQoIsOwCfFIT8vzdWK7J960JK6/yHPFpXTVk3r+j6A50Us3jFAQAA",
+  "Body": "H4sIAAAAAAAAAFWQQYvCMBCF/0vOXWhtjeIt0LoIS1dsZQ/LIjGdaCA2JUllRfzvO4nK4m345s2bN3MlO9WRBaEzoHnK5SylEymKOfC8AL6XJCFCj86DrfkJUGh6rXpgVhzVGdzblGZBYrR+9D04/yAgvDJ9exkCb1pWl2xThp5V6Kc4WVxJxz0sFejufzQiY0/cI1s1nyVrK8TwOygLTOJoyS+OLPKE+Lt3VNziJF9bI8C5DRxwd9ggtBk7pGfVgUUx+2rQzT76ZNvsKta0uywa7F+vOFgzDqvnfyYwp9M5zWg2maY0lylkBYoGbr0Kl8Y7MNj3lchQvnpFdH9GP2qdEGNjoPT2EzxGB7hHcu0gIU4coRs1hPzPG6sl2360IaXz+CFE66ouV/U7uf0BLPsdN8UBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561/onlineArchives/67e630af7062fc48ea34eabf",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "312"
+      "311"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:59 GMT"
+      "Fri, 28 Mar 2025 05:16:32 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "48"
+      "41"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_2.json
similarity index 68%
rename from test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
rename to test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_2.json
index b962d70788..58cfe682a8 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgZmluZCByZXNvdXJjZSBPbmxpbmUgYXJjaGl2ZSB3aXRoIGlkIDY3ZTQyZjgyOTc3YjI3NzZmN2E3ODJiOS4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJSRVNPVVJDRV9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbIk9ubGluZSBhcmNoaXZlIHdpdGggaWQgNjdlNDJmODI5NzdiMjc3NmY3YTc4MmI5Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgZmluZCByZXNvdXJjZSBPbmxpbmUgYXJjaGl2ZSB3aXRoIGlkIDY3ZTYzMGFmNzA2MmZjNDhlYTM0ZWFiZi4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJSRVNPVVJDRV9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbIk9ubGluZSBhcmNoaXZlIHdpdGggaWQgNjdlNjMwYWY3MDYyZmM0OGVhMzRlYWJmIl0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561/onlineArchives/67e630af7062fc48ea34eabf",
   "Headers": {
     "Content-Length": [
       "213"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:02 GMT"
+      "Fri, 28 Mar 2025 05:16:35 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "65"
+      "37"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..04afd5730a
--- /dev/null
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKm8aMbhTKKdDhwTqziYIhEe6thaVOS1IcN//tiRdQpbfaYm5N7T3KT/CDOsi+FvM8ftJWQIA9ttc6Vh/GaiyJ+iGHXSkW2EfGqtRYppjnDVHOq8K6NN1IUucLuI7hteHJ7Ty5xSbvnuJ3EAdI1KQqlQSqcS7FjMUgsYcNEpp5ZZuZi6Isi076WBTROiPKDedTQDKT/RpxGTjcwKlKfNJiGVI1Bjk3EJ46DmkgCN8IKeIL2i8NQFVwfN8MypWm2hoh9wzFCd5RxuuIwOTqUwRgSatYg7+DQRBlNwWScRcswiKZLgvbNCyahXN1C7RpoHt5m+lutZCoT9YNlPxxNJ8Gw2iqcLUfvk+mglrqndR+q9DpBnRrIVv7EVRaNAov+BGM7KHqfTQf1nbwiK3d7RXZryLJZVp5nss7zTNp7Wp2SJVXp9xba3QXD2dR8saHMvfoPVen/OrTzNw+2/oldtaBnTT5WHtzHpeDiHCdOOTx9tIek86gMaaEpL/9i5JH9L9vPLzcUBgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "414"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:20 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "46"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 0d9737cc9d..0914647488 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:51 GMT"
+      "Fri, 28 Mar 2025 05:07:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
index 18d77878b5..70c462e38f 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJkZXRhaWwiOiJBbiBhcmNoaXZlIG11c3QgYmUgaW4gYW4gYWN0aXZlIHN0YXRlIGluIG9yZGVyIHRvIGJlIHBhdXNlZC4iLCJlcnJvciI6NDA5LCJlcnJvckNvZGUiOiJPTkxJTkVfQVJDSElWRV9NVVNUX0JFX0FDVElWRV9UT19QQVVTRSIsInBhcmFtZXRlcnMiOltdLCJyZWFzb24iOiJDb25mbGljdCJ9",
   "Status": 409,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561/onlineArchives/67e630af7062fc48ea34eabf",
   "Headers": {
     "Content-Length": [
       "174"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:00 GMT"
+      "Fri, 28 Mar 2025 05:16:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "50"
+      "38"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_2.json
similarity index 80%
rename from test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
rename to test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_2.json
index a576a82132..208000df72 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_2.json
@@ -2,7 +2,7 @@
   "Body": "eyJkZXRhaWwiOiJUaGUgcmVxdWVzdCBjb250YWluZWQgbW9kaWZpY2F0aW9ucyB0byBpbW11dGFibGUgZmllbGRzLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6Ik9OTElORV9BUkNISVZFX0NBTk5PVF9NT0RJRllfRklFTEQiLCJwYXJhbWV0ZXJzIjpbXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
   "Status": 400,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561/onlineArchives/67e630af7062fc48ea34eabf",
   "Headers": {
     "Content-Length": [
       "169"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:00 GMT"
+      "Fri, 28 Mar 2025 05:16:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "55"
+      "33"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_3.json b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_3.json
similarity index 74%
rename from test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_3.json
rename to test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_3.json
index 93ee945327..f8b51be990 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_3.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_67e630af7062fc48ea34eabf_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJfaWQiOiI2N2U0MmY4Mjk3N2IyNzc2ZjdhNzgyYjkiLCJjbHVzdGVyTmFtZSI6Im9ubGluZUFyY2hpdmVzLTU4MyIsImNvbGxOYW1lIjoidGVzdCIsImNvbGxlY3Rpb25UeXBlIjoiU1RBTkRBUkQiLCJjcml0ZXJpYSI6eyJkYXRlRmllbGQiOiJ0ZXN0IiwiZGF0ZUZvcm1hdCI6IklTT0RBVEUiLCJleHBpcmVBZnRlckRheXMiOjQsInR5cGUiOiJEQVRFIn0sImRhdGFQcm9jZXNzUmVnaW9uIjp7ImNsb3VkUHJvdmlkZXIiOiJBV1MiLCJyZWdpb24iOiJVU19FQVNUXzEifSwiZGJOYW1lIjoidGVzdCIsImdyb3VwSWQiOiI2N2U0MmQ1Y2FkYmE2NTEzYThjNWY5NmYiLCJwYXJ0aXRpb25GaWVsZHMiOlt7ImZpZWxkTmFtZSI6InRlc3QiLCJmaWVsZFR5cGUiOm51bGwsIm9yZGVyIjowfV0sInBhdXNlZCI6ZmFsc2UsInNjaGVkdWxlIjp7InR5cGUiOiJERUZBVUxUIn0sInN0YXRlIjoiUEVORElORyJ9",
+  "Body": "eyJfaWQiOiI2N2U2MzBhZjcwNjJmYzQ4ZWEzNGVhYmYiLCJjbHVzdGVyTmFtZSI6Im9ubGluZUFyY2hpdmVzLTU2MSIsImNvbGxOYW1lIjoidGVzdCIsImNvbGxlY3Rpb25UeXBlIjoiU1RBTkRBUkQiLCJjcml0ZXJpYSI6eyJkYXRlRmllbGQiOiJ0ZXN0IiwiZGF0ZUZvcm1hdCI6IklTT0RBVEUiLCJleHBpcmVBZnRlckRheXMiOjQsInR5cGUiOiJEQVRFIn0sImRhdGFQcm9jZXNzUmVnaW9uIjp7ImNsb3VkUHJvdmlkZXIiOiJBV1MiLCJyZWdpb24iOiJVU19FQVNUXzEifSwiZGJOYW1lIjoidGVzdCIsImdyb3VwSWQiOiI2N2U2MmU4NjU4NjE2MTI1MDYzZjBlMTQiLCJwYXJ0aXRpb25GaWVsZHMiOlt7ImZpZWxkTmFtZSI6InRlc3QiLCJmaWVsZFR5cGUiOm51bGwsIm9yZGVyIjowfV0sInBhdXNlZCI6ZmFsc2UsInNjaGVkdWxlIjp7InR5cGUiOiJERUZBVUxUIn0sInN0YXRlIjoiUEVORElORyJ9",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561/onlineArchives/67e630af7062fc48ea34eabf",
   "Headers": {
     "Content-Length": [
       "453"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:01 GMT"
+      "Fri, 28 Mar 2025 05:16:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "67"
+      "60"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_1.json
index cb833738f1..04d008aecd 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMTEJmWrOnVvl1YdDvsIVo2NfIYOEf9eoqhps1QszPf07kmnOzPtRkoYn8LoE6uLjOmIkNCwmolCyLwoc6Fe9qouq1oWbyxj9jJTFR6EkRpMA0ruSzhq2T6odpk76z+J1e9n1kVsF7ZLaaCac+3CaHKD064P/hRMs9Oh5zBYDskB8UnwUwzjQPwfe0S3KAldy+ZsgxVcB5/Aeox023ZnvzP/gTequZ5nVcsPuk2JgQQNEL7Supx7fpumAde1XLmNGmLQSISrOm7sNi1fnU3oLKUVLb/s/JExDz0uePDL9+Jj1J2dkHIUmIujXGwhnp4vfy+xNaCOAspWoBFYGaO0wQObvwFnmCpHSwQAAA==",
+  "Body": "H4sIAAAAAAAAALWTsU7DMBRF/8VzUjtu44ZsiIkdFhCDa980Fq4d+TllqPrvpKoodEFZMr+je4/0dE/M+JEy0lMcQ2atKJhJ0BmWtUwKWZdiXcrmRdSt2LbVwxsrmLvc1BZKolF1oypVyVqodSdQbaa7d+GTWPt+Yn1CN7F9zgO1nBsfR1taHFeHGPbR7lYmHrgeHNfZa+JHyfcpjgPxf9IT/BRJ8B07FwtUcBND1i4g0a3tLv0u+Q+8kM31PbNcftBlTKzOeqcJrzRP555fxmnAPJcrt5BDigZEmOVxY5dx+epdhneUZ7j8suePggV9wITHMK0Xj8n07ggqIVEqeZldTPvny+5rdFarRup1J2ElttYqY7Fh528fSuG9SwQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:48 GMT"
+      "Fri, 28 Mar 2025 05:07:18 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2085"
+      "1433"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_1.json b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_1.json
deleted file mode 100644
index 78830c6868..0000000000
--- a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVyW7bMBD9lYLnxFpcW4luiu0GLrwEltJ0QRFQ1NhmQ5ECSblwAv97h6abxV3QS9uDAZnDefPImff4QGi1oZJBNVByyVetppYrSdIHwlpjVT1vQBojBrxZg/Z7CmGimKSfPp+Qmktet/VI0lJAhYErraxiSpCUFJM8uo3JCbHCPE+fqgowPBy9ya4nBdmdkJKyu7Y5gJB0SYUBXOW4XwKzSjs6cBTWQKsrDUvQgPQR0ABTsqJ66yCZQPagi23jQovR1WQ8yPJRgXSYR8VT5lZzuTKI7jIQ0MIQf5gQh3HvNOyexv0i6qfdJO3FHzG14uYu5/dweUHSbtgJ/coN1XgP38/15noy+XB7ky2moyGmIDm9bVy1zC7AWLygDa8Aj0Rm89kId6yEKqkYeMI5iOWUSrqCKl9TXSHu44lXWrXNGG+A9BN4HVc9RquS9ntRl56x3vK8v0Q0/hTvh+dJUsZJ0l8mNOlFUYRxQUsQxndPcHnnPh/IGi8S89bWNiYNAiZUW51WsOnUSq5UVXaYqgPa8IBaQU2wiYM9GRP8iklwaIAJlMQykGm25hswp72zLnHNE/uOiSU26x+XD/y4BRq7oTS8VaV5ZPSCwYvqz3f/N8pG0saslf0Twk97d06oLjK8mNIvSr/DInuNk7NOSB5jL5Y7fQxIWruJ/mkHG9qaZ2psuD3Wr4ZGcLa3k7wB5gftN+MZuvGUbb2fe9wdOYgVZnvb8PkoDbG1nJkDJCJKY52BOV0i9jQKD0Idz69yJ9MQZQqleadEW8PBEPIimw2zhROoRNkOVCstSUO0AdpalTMq9sJDE1R10zpL+NGAGg0VRx/ZwPHJDebDUH2VLwM7z8uZxzHaDmMg0JXc4t84WnfnCHOlud2SNHF/vA/NfI+zm5x4T51Lsf1bl+v7eSh5nd+Osry4jfYDeq8kjH8zHOfE7zkkf8TPVz5TK2UHoO2h+jhfXC7m8+K9Gydkb7+nDBajrBjPLt2LBM6x96PpHiz/Ghx3ceP1sMC+UAP5FsVZI8ykyMnuG7e52NE3BwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "795"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:52 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "504"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_1.json b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_1.json
new file mode 100644
index 0000000000..758a80468c
--- /dev/null
+++ b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfW/JBSVHeUqAVEx8VSdut01SZ5AJeHTuyHSZa8d93jdMO2FbtpdsDUvD1PffY957jZ0KLNRU5FD0pFmxZK2qYFCR+JnmtjSynFQiteY9VK1BuT8Z1EJL4y9cTUjLByrocCDrnUGDgWkkjc8lJTLJRGjyE5IQYrvfTx7IADPcHl8nNKCPbEzKn+WNdNSAkXlCuAVcZ7heQG6ksHTgKK6DFtYIFKED6CKghl6KgamMhc47sQWWbyoZmg+vRsJekgwzp5A4VT5kaxcRSI7rNQEADffxhQuiHnVO/fRp2M78T++dx6N9jasH0Y8qe4OqCxG2/5buVO6rwHl7OdXkzGn1+uEtm40EfU5Cc2lS2WmJmoA1e0JoVgEcik+lkgDuWXM4p7znCKfDFmAq6hCJdUVUg7uuJl0rW1RBvgETnEIXQjTrdKIiCsONH7YUPwRmisb1499yPwkV+1gXaPiuCxRzjnM6Ba9c9zsSj/XwmK7xIzFsZU+nY83Iu6+K0gHWrlGIpi3krl6VHK+ZRw6n21qG3I6O9PzHxmgZoTwosA4nKV2wN+rQTBcQ2j+86xhfYrH9c3nPj5inshlTwUc71K6MDBgfV93f/N8pa0EqvpPkbwj/3bq1QbaR/MabfpLrFIjuNk27LJ6+xg+VWhAFBSzvRv+1gRWu9p8aKmWP9Kqg4y3d2klaQu0F7YzzBjqeoy93c4+7AQiwx29mGy0dp8I1huW4gEVFoYw3M6hKxx4HfCHU4vU6tTH2UKcz1reR1CY0hpFky6SczK1CBsu3JWhgS+2gDtDYyzSnfCQ9NUJZVbS3hVwOqFBQMfWQNxyfXmA99+V0cBraOlzWPY7QtxoCjK9nF9zhae2sJM6mY2ZD43P5xPjRxPU7uUuI8dSr45r0u1/WzKXmTPgySNHsIdgP6JAUM3/CuNnF7muR7/PzgMpWUpgfKNNWH6exqNp1mn+yUInvzktKbDZJsOLmyLxJYx96Npn2w3Gtw3MW108MM+0I1pBsUZ4kwoywl2x+/ias6NwcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "793"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "569"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_1.json
similarity index 57%
rename from test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_1.json
index 6b426f5a3b..a7ccd55ffe 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e62e8658616125063f0e14_clusters_onlineArchives-561_onlineArchives_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWQ0WvCMBDG/5c8dzDr2lTfAq2jMDqxlT2MIWly0UBsSpLKRPzfl0S34dvxu+++++4uaCc5WqIcw0sqinSBcZ9inAtMcZH2C5QgpibrwDT0CF6oByUHIIYd5AnsU1bMg0Qrde87sO5OgDmph+48Bt52pCnJpgw9I72fpGh5QZw6WElQ/H80Im2O1HlWt+8l6SqP4XuUBojwoyU9W7ScJ8jdvKPiGifp2mgG1m5g73eHDUzpiXt6khyMF5OP1ruZex9t211F2m43iwb94xV7o6ex/vsPzxjlPc2z2ZwWLBOLXHjRSI2T4dJ4hw/2eUEilI9eEd2eMUxKJUibGOj5+hU8Jgt+j6DKQoIsOwCfFIT8vzdWK7J960JK6/yHPFpXTVk3r+j6A50Us3jFAQAA",
+  "Body": "H4sIAAAAAAAAAFWQQYvCMBCF/0vOXWhtjeIt0LoIS1dsZQ/LIjGdaCA2JUllRfzvO4nK4m345s2bN3MlO9WRBaEzoHnK5SylEymKOfC8AL6XJCFCj86DrfkJUGh6rXpgVhzVGdzblGZBYrR+9D04/yAgvDJ9exkCb1pWl2xThp5V6Kc4WVxJxz0sFejufzQiY0/cI1s1nyVrK8TwOygLTOJoyS+OLPKE+Lt3VNziJF9bI8C5DRxwd9ggtBk7pGfVgUUx+2rQzT76ZNvsKta0uywa7F+vOFgzDqvnfyYwp9M5zWg2maY0lylkBYoGbr0Kl8Y7MNj3lchQvnpFdH9GP2qdEGNjoPT2EzxGB7hHcu0gIU4coRs1hPzPG6sl2360IaXz+CFE66ouV/U7uf0BLPsdN8UBAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives",
+  "Path": "/api/atlas/v2/groups/67e62e8658616125063f0e14/clusters/onlineArchives-561/onlineArchives",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "312"
+      "311"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:58 GMT"
+      "Fri, 28 Mar 2025 05:16:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "724"
+      "518"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/memory.json b/test/e2e/.snapshots/TestOnlineArchives/memory.json
index 489a15e85b..d061a5d6b5 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/memory.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/memory.json
@@ -1 +1 @@
-{"onlineArchivesGenerateClusterName":"onlineArchives-583"}
\ No newline at end of file
+{"onlineArchivesGenerateClusterName":"onlineArchives-561"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_disable_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e62e8b58616125063f0f6c_managedSlowMs_disable_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_disable_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e62e8b58616125063f0f6c_managedSlowMs_disable_1.json
index 2d970f569f..771dbd1fde 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_disable_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e62e8b58616125063f0f6c_managedSlowMs_disable_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/managedSlowMs/disable",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/managedSlowMs/disable",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:38 GMT"
+      "Fri, 28 Mar 2025 05:15:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "75"
+      "28"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_1.json
deleted file mode 100644
index 19f0e9ce11..0000000000
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfWxI+SmjeMqAVEx8VSdet01Q58QW8OnZkO0ys4r/vGmddYeq0l6kPSMH33uNj33uOnwhlWyoLYEMlV3xda2q5kiR+IkVtrCoXFUhjxJBXG9A+JxOm3SHxl69npOSSl3U5ljQXwDBwo5VVhRIkJtk0bT90yBmxwrwsnykGGB6Nr5LbaUb2ZySnxWNdNSAkXlFhAFc55ksorNKODpyENVB2o2EFGpA+AhoolGRU7xxkIZA96GxXudByfDOdDJN0nCGdwqPiKVOruVwbRHcVCGhhhD8s6ISdi/Owe97pZ+1+3B3Evct7LGXcPKb8B1y/J3E3bIV+5Y5qvIdf57q6nU4/P9wly9l4hCVITu8qt1til2AsXtCWM8AjkfliPsaMtVA5FUNPOAWxmlFJ18DSDdUMcZ9PvNaqriZ4A6QfQa/DLvuXUZR3oqi/imh0EfW6iMZfxC8py2n/ot2lg6If9gYuLmgOwvjuCS4f3ecT2eBFYt3G2srEQVAIVbNzBttWqeRasbxVqDKgFQ+oFdQE205wIGOC15gETQNMUIFeKV26GUvYlhulzwfdiLgGikPXxAob9gYUAj92gcauKA0fVG6eWR2xOGLwMvtNaRtJK7NR9l9I/87dO9G6yOj9jH5T+iNudNA7GbRC8hw7Wm71MSBp6ab71W5WtDYv1Flxe6pnDZXgxcFe0goKP3h/GdfI8ZF1edABZrcdxBqrvY34epSK2FlemAYSEaWxjp7TKWLP2mEj3MniJnWyDVG2kJuPStQlNAaRZsl8lCydYCXKeKhqaUkcoi3Q2qq0oOIgRDRFVVa1s4g/DanSwDj6yhZOT26wHkbquzwO7D0vZyanaHuMgUCXcov/42jdvSPMleZ2R+LI/fG+NPd9Tu5S4j12IcXuf12u72ez5W36ME7S7KF9GNIfSsLkL8MxID6nKb7Hz3e+Uitlh6Bts/skXV4vF4vsUxsrkL39VTJcjpNsMr92LxRdN5aIwkMvPwype8r8O3Haz61XxxI7RA2kO5RriYDTLCX7n4pHYkBRBwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/clusters/performanceAdvisor-837",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "801"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:50 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_2.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_2.json
deleted file mode 100644
index d44ff70719..0000000000
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVW728aORD9V07+0C8X2B8kLFkpOm2BVpwgROymueupiszuAG689tb2UtGI//3G601DuCY9qaoqgbR4PM9vZ+Y9c09osaUih2IoxYqta0UNk4LE9ySvtZHlvAKhNR+yagPK7cm4DkIS//PhhJRMsLIux4IuORQYuFLSyFxyEpNsmga3ITkhhuvD9JksAMOj8ZvkepqR/QlZ0vyurloQEq8o14CrDPcLyI1Ulg4chRXQ4krBChQgfQTUkEtRULWzkDlH9qCyXWVDi/HVdDJM0nGGdHKHim+ZGsXEWlt0bajNRXhSSrGWxTL2vArUSqrSlgerxLRUnUEv6ugNbuz4Pn66nwxdy26b0ilg2xVg4jDyg+jku+nBj6WHL6V7f2DXLoyq4RWtzSaVtcrhghbYsVcKKs5ymoK5oIZT3Ql8sfv88QEaa/RQjlRtHyvyu1bbZ6vybS5NK7BTBkb4RajQD886fq8T9rOgH/cG8en5ezyvYPouZV/g7WsS9/yu71ZuqEK6DwPz5no6/fv2JlnMxiNMwa6rXWXbmJgFaIOTt2UF4KyQy/nlGHesuVxSPnSTkAJfzaigayhS+5qI+3WU1krW1cT2vh/BaVic98+jaBlGUX8V0egsOu0hGjuIn9NiSftnQY8O8r5/OrBxTpfAtZMFZ+LOPt6TDU4o5m2MqTTWLueyLpritIXq5rL0aMW8phHeNvQaMtp7jonXTrY+7EPy2AdilcEbOfAVlv8XUPCcnj2FXZEK/pRL/ZXVExZPGBzu/qW0taCV3kjzf0g/7t1bN7SR0esZ/SjVOzyoMVIy6FpFtbEny90+BgQt7XQ/282K1vrA9ipmjo2ylXPjaBXkbvBeGNfI8hF12egAdwcWYo3Zzp9dPkqF7wzLdQuJiMK6Qg5Wp4g9C/xWuJP5VWpl66NsYanfSV6X0DpvmiWXo2RhBStQxkNZC0NiH20BXUmmOeWNEPG2kWVVW4v4r9NXCgqGhr2F4zfXmA8j+Vk8DewdL2smx2h7jAFH+7eLP+PVentLmEnFzI7Ekf3hfOnS9Tm5SYm7vOaC735WcV0/2yOv09txkma3QTOkX6SAyQvDMSBuT5v8Hh9/c5lKSjMEZdrTJ+ni7WI+z/4K3IVhHlImo6m1X7wPWjtE0aGPNwNq/x+4y/e4l1unjAV2h2pIdyjVEsGmWUr2/wJTeBBTpggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/clusters/performanceAdvisor-837",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "910"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:35 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "73"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_1.json
deleted file mode 100644
index a4c21b9e28..0000000000
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAANWVUU/bMBSF/4sfeCKxk5QYIlVT1fFQaXRR4WWgaTLxberNsY190wmh/nfcMl6AiK3S2JDy4tx7rM/3HNl3RCvzI5Dq6o6sPCxJRVaILlSUNtr2MpGwTjtrWiuv08Z2VDhFBWoR6Dqnrbe9C7TkMMrlSXnC+XXOebnkgh/xUUGdtw2EAOGDMo3uJUxtb3CMvocDJ1qY9904O1AIXajB1/HPOGOMHBIPOpIE0Euy+bpdhl7jA2XjQSDIWM5ZfpSwIsnLi6ysRmXFssuo3UHNtg1DXLFpZQMa0UHs2p0myZi5/fk9CSvhZcJY/NIbFK19PPxuEAYwapX8Y1WVc5bxqI0irJVpX8IvRlv8N/GD7on/xBdnPZKH4rbmtGrEOeB8eLBxD7x18KtjcVp/mk0n385Pp5/nHyeLL7HcB/ATrUScAXHgl9Z3wjQg5FoF65Pjgv+WSWvwQVkTNzlOWVqSzeHbRSfbKzoDqvcSndfw/1J06sXsbI/gDFv0L4OT7xWcAdV7Cc5r+P/bnTNs0rPoRFy0KPTu2SNVsbkH61OveW8HAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/processes",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "428"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:35 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "90"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasProcessesResource::getAllAtlasProcesses"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_performanceAdvisor-82_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_performanceAdvisor-82_1.json
new file mode 100644
index 0000000000..c50153aec2
--- /dev/null
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_performanceAdvisor-82_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfCwmhfChvKbCKiY+KpO3WaUImuQGvjh3ZDhOt+O+7xmkHTJ320u0BKfjee3zse8/xM6HZlooUsoEUOVtXihomBQmfSVppI4t5CUJrPmDlBpTLSbhuBST8+u2CFEywoipGgq44ZBi4UdLIVHISkmQSt5YBuSCG6+PyqcwAw8PRx+h2kpD9BVnR9LEqaxAS5pRrwFWG+QJSI5WlA2dhBTS7UZCDAqSPgBpSKTKqdhYy5cgeVLIrbWgxupmMB1E8SpBO6lDxlLFRTKw1otsKBDQwxB8WBH7QafjtRtBP/E7o98Kg94ClGdOPMXuC6ysStv2m71buqcJ7eDnXx9vJ5MvyPlpMR0MsQXJqV9rdIrMAbfCCtiwDPBKZzWcjzFhzuaJ84AjHwPMpFXQNWbyhKkPc1xOvlazKMd4A6fagG0B/1el3W91W0PG77dzPuymisaN43vO7QZ5e9oG2L7P2pW0Gpyvg2nWPM/FoP5/JBi8S6zbGlDr0vJTLKmtksG0WUqxltmqmsvBoyTxqONXeNvAOZLT3FhOvboD2SlC5VIWdsSjbMi1Vo2+JKOCHpvEc+/XvGXhu6DyFPZEKPsmVfiV1QuKEwHH2/2StBS31Rpq/4fwrd28VayPDqyn9LtUd7nMQO+k3ffIaO1ludjEgaGFH+61WlrTSR8osmTnXsoKSs/RgLXEJqRu6P4xq0Le7VsVBA5jdshBrrHYW4upRJnxnWKprSEQU2lh2VqOIPW35tWjH85vYStZHycJK30leFVCbQ5xEs2G0sGIVKOGBrIQhoY+WQCsj45TygwjREGVRVtYefjejUkHG0FO2cH5yjfUwlD/EaWDveFkjOUfbYww4OpRdfI+jtfeWMJOKmR0Je/aP86SZa3N0HxPnr3PBd+91ua6f9Za38XIUxcmydZjRJylg/PZwtO3M2Zy6+AE/P7hKJaUZgDL17uN4cb2Yz5PPLaxA9ualZLAYRcl4dm1fJ7qu7RBlhz5+GFL7jLk34ryfWyeOBXaIaoh3KNYCASdJTPY/Ab31FrJNBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/clusters/performanceAdvisor-82",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "801"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:27 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "52"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_performanceAdvisor-82_2.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_performanceAdvisor-82_2.json
new file mode 100644
index 0000000000..61f4114be4
--- /dev/null
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_performanceAdvisor-82_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVW72/bNhD9VwZ+6JfF1g8ntiEgGFzbLTzYcWAqzdZhCGjpJHOhSI2kVLiB//cdJSV1vKUtMLQFbEDm8Y5P9+49+oGwtGYygXSqZMbzSjPLlSTRA0kqY1WxLkEaI6a83IFu98TCBCGJ/vjzjBRc8qIq5pJtBaQYuNbKqkQJEpF4SYO7kJwRK8xx+kqlgOHZ/M3kZhmTwxnZsuS+KrsiJMqYMICrHPdLSKzSDg6chDWw9FpDBhoQPhY0kCiZMr13JROB6EHH+9KFNvPr5WI6ofMY4SRtVXxLajWXuXHVjWUuF8uTQslcpdvI80rQmdKFaw92iRule+OwZ3a4r+f7+OmrMPu77HcZvRTqvgQbhSM/GJ19KTv4X9nh57K9X5CyS6sreMUqu6Oq0glcshTpeqWhFDxhFOwls4KZXj3Oa6EfS2ODHntBdf2pHT8bXb/Ukv+G0tCALFmY4RcrhX540fMHvXAc+xeRP0Ks7/G4lJt7yj/C29ckGvh9v125ZRrRPg7Lm5vl8ve728lmNZ9hCjKu96WjcGI3YCxOXc1TwDkhV+urOe7IhdoyMW2ngILIVkyyHFLq3hLrPo1RrlVVLhzvwxEMQxhvL8bDYBiEF/5wkPnZMMFq/CiejfxhmCXnY2CD83Rw7iZcsC0I00pCcHnvHh/IDqcT83bWlgZblwhVpU1zukb1E1V4rORew4NXh14DxngvIfG6qTbHNEyeaCBOFKJRgsiw+98fgdcq2dPIidLwq9qaJ1DPQDwDcLz7R6I2kpVmp+zXYP609+Bs0EVmr1fsL6Xf4TmNg5Jx36mpiz1b7g8xIFnhRvslKktWmSO7K7k9NchOyY2TlZC0Q/eZUQ3H7tSqaDSAuwNXIsfs1pfbfJSJ2FuemK4kVpTOEBJwGsXaq8DvRLtYX1MnWR8lC1vzTomqgM5xaTy5mk02TqwSJTxVlbQk8tES0JAUTZhoRIi3jCrKytnDvx2+1JByNOoaTt/cYD7M1Af5PHBocTkjOa12wBgItH23+C1ebXBwgLnS3O5JNHI/Wk+6amme3FLSXlprKfbfqrktn92RN/RuPqHxXdDM6EclYfHycAzczLk9XfJ7fPypzdRK2Slo252+oJu3m/U6/i1o7wr7mLKYLZ31WpZ3VoiSQw9vBtT9L2gv3VMu61YYG2SHGaB7FGqBxZYxJYd/AKCI0hmeCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/clusters/performanceAdvisor-82",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "909"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:14 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "56"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..04666ee68e
--- /dev/null
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKm1VmlUEaRDgd+YRUHQyTaWw1Lm5KkPkz874sVUae02WNuTu49yU1yQIym3xK5Xwe0ExAjF+2UyqSL8YbxPHqJYN9IeLrl0bqx4QkmGcVEMSLxvom3gueZxE4HnCZ01+2uYzt2s205rdiKnY1OkUsFQuJM8D2NQGABW8pT+UZTPRdBj+ep8pTIoXZBpOcvwpqiILyhbdUysoVRnnh2jSpI5ATEREc827JQHQlgWlgCi9FxeRrKnKnzZmgqFUk3ENIfOEfInlBG1gymZ4ciGEFM9BrknhzqKCUJ6IzzcBX44Wxlo2P9hokJk49QswJaBI+Z/lYrmNJEPX/VC0azqT8otwrmq9F4OutXUs+0nkOlXheoVQGZyl+40qKhb9Aff2IGheP5rF/dyTuydLd35GsFWTTLyPNKVnleSXNPo1MypEr9hoHZXdCcSc13E0rfq/9Qpf4fAzN//WCrn9hdC9rGZKf04D5vBZfXuG0Vw8tHe0q6CIuQ4oqw4i9Grn38BYRuSjsUBgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "414"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:26 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "55"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_1.json
new file mode 100644
index 0000000000..eec6205321
--- /dev/null
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAANWVXUvDMBSG/0suvLJNmtmuFIaM6cVAZ5neqIhk7WkXTJOYpAWR/XezTW+Uohv4Bb1pz3nDk3Me6DMSXD5YlN0+o6WBCmVo6Zy2GcaFUG0ZlNCFjZK1KhdhoRrMNMfMCWZxR3FtVKstToaQUEgXcZpESURjkgwqUiUF1kYVYC3YYy4L0ZYwUa10I2daONCshlnbjKID7qCxOZjcfxlFhKBDZEB4EguiQqu79atthdtSFgaYg9KXKaFxQAYBTa9InEVH2WB447MbqOm6oY/LNy2VdZI14Ls2twm6tO6ECeySmTIgxD+hotWjfrv8ZhASnM/ycudURockGvqsD7mcy/ojfpyRozX+j+wD74n/bi9aGYe2xXVNC16wS3Cz/sH6M9yThteO+Wl+Np2M7y9PJxezk/H82pdbC2YsOPMzQBpMpUzDZAGs7LhVJkjpl3bUgbFcSX9GGpIwQavDnzMn2sucntR/Mecz/D9mTv+OftMcupc5Pan/Ys5n+N9kTj6fnu/uTf+GPnjjWZ1yTGz+eSgbrF4AAC+EeGwHAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/processes",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "422"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:14 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "39"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasProcessesResource::getAllAtlasProcesses"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
similarity index 79%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
index 4223827c70..149d470c83 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJuYW1lc3BhY2VzIjpbXX0=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/processes/atlas-10nywj-shard-00-00.qtago.mongodb-dev.net:27017/performanceAdvisor/namespaces",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/processes/atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net:27017/performanceAdvisor/namespaces",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:36 GMT"
+      "Fri, 28 Mar 2025 05:15:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "134"
+      "42"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
similarity index 79%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
index b0d349bbbc..0df7a30c4e 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJzbG93UXVlcmllcyI6W119",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/processes/atlas-10nywj-shard-00-00.qtago.mongodb-dev.net:27017/performanceAdvisor/slowQueryLogs",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/processes/atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net:27017/performanceAdvisor/slowQueryLogs",
   "Headers": {
     "Content-Length": [
       "18"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:36 GMT"
+      "Fri, 28 Mar 2025 05:15:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "125"
+      "75"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
index 46140cba79..ef93121d06 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e62e8b58616125063f0f6c_processes_atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
@@ -2,7 +2,7 @@
   "Body": "H4sIAAAAAAAAAKtWKs5ILEgtVrKKjtVRKi5NT08tLklN8cxLSa2AiNYCAM+IOQ0jAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/processes/atlas-10nywj-shard-00-00.qtago.mongodb-dev.net:27017/performanceAdvisor/suggestedIndexes",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/processes/atlas-v8gvlr-shard-00-00.o2fqp.mongodb-dev.net:27017/performanceAdvisor/suggestedIndexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:37 GMT"
+      "Fri, 28 Mar 2025 05:15:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "228"
+      "83"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 0676aab443..22c955ea2a 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:48 GMT"
+      "Fri, 28 Mar 2025 05:07:26 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_1.json
index 85ba27adec..e9843ce2b2 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxNSAHdiqTt3bpVWHwz4Sq8ZGPpMOEf9eoqhps1QszPf07kmnOzPtJkoYn8LkE2uLjOmIkNCwlolC1HlR5kK+PMi23LfV/o1lzF5mUmElTCMbpTqhlOwVqFpV5TJ31n8Sa9/P7BixX9hjSiO1nGsXJpMbPO2G4A/BdDsdBg6j5ZAcED8JfohhGon/Y4/oFiWh69mcbbCC6+ATWI+Rbtvu7HfmP/BGNdfzrGr5QbcpMZCgA8JXWpdzz2/TNOK6liu3UUMMGolwVceN3abl62gTOktpRcsvO39kzMOACz5i7EMcwGt8NCdLIeYoMBdNsxhDPDxffr/G3oDcCyh7gUagMkZqgxWbvwEYN0k7TwQAAA==",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxI4pBrFVnbq3S6sOxj6DVWMjn6FDxL+XKGpaloqF+Z7ePel0F6LchAniU5h8Ig3LiIogE2jSEM54mbMi5/ULKxtWNVy8kYzY60xUIDjUbVmLszjzkonCMCPUOnfWfyJp3i+kj2BWtk9pxIZS5cKkcw3zaQi+C7o9qTBQOVoqk5NIZ067GKYR6T/2CG5VIjhDluyAFVQFn6T1EPG+bWPfmP/AB9XczrOr5Qc9pkTLJFuJ8Ir7crb8MU0j7Gu5cQc1xKAAEXZ13NljWr56m8BZTDtaftnlIyNeDrDiI0QT4iC9gkc9WwwxBw55warVGGL3fP39EoyWouayMBw0h0proTQ8kOUbRHc8QU8EAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "292"
+      "290"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:46 GMT"
+      "Fri, 28 Mar 2025 05:07:23 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2363"
+      "3715"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_1.json
deleted file mode 100644
index 67077e7a45..0000000000
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoUlbaNq8hbagTv1ATYCNaUJOfNt6OHZkO50K6n/fdV0YdALtBfFQKfW99/jY957jR0LZmsoCWF/JBV/WmlquJIkfSVEbq8pZBdIY0efVCrTPyYRptkj84+cRKbnkZV0OJc0FMAxcamVVoQSJSTZOm3ctckSsMC/LJ4oBhgfD8+RqnJHtEclpcV9XexASL6gwgKsc8yUUVmlHBw7CGii71LAADUgfAQ0USjKqNw6yEMgedLapXGg+vByP+kk6zJBO4VHxlKnVXC4NorsKBLQwwB8WtMLW6XHYPm51smYnbnfjk94tljJu7lP+ABdnJG6HjdCv3FCN9/B0rvOr8fj73U0ynwwHWILk9KZyuyV2DsbiBa05AzwSmc6mQ8xYCpVT0feEUxCLCZV0CSxdUc0Q9/nES63qaoQ3QDoRnLRYr9OLorwVRZ1FRKPT6KSNaPxFvEdZTjunzTbtFp3wpOviguYgjO+e4PLefT6SFV4k1q2srUwcBIVQNTtmsG6USi4VyxuFKgNa8YBaQU2wbgU7MiZ4i0mwb4AJKtALpUs3Ywlbc6P0cbcdEddAseuaWGDDPoFC4Mcu0NgVpeGrys0zq1csXjF4mf2ptI2klVkp+z+k/+ZunWhdZHA2ob+UvsaNdnon3UZInmOvlhsdDEhauul+s5sVrc0LdVbcHupZQyV4sbOXtILCD9474xo5PrIudzrA7KaDWGK1txFfj1IRG8sLs4dERGmso+d0itiTZrgX7mh2mTrZhihbyM21EnUJe4NIs2Q6SOZOsBJl3Fe1tCQO0RZobVVaULETIpqiKqvaWcS/hlRpYBx9ZQ2HJzdYDwP1W74ObD0vZyaHaFuMgUCXcosfcbT21hHmSnO7IXHk/nhfmvo+Jzcp8R47k2LzUZfr+7nf8iq9GyZpdtfcDemDkjB6Zzi6xOfsi2/x84uv1ErZPmi7332Uzi/ms1n2rYkVyN4+lfTnwyQbTS/cCwXOwXej6R4w/zocdnHtNTHHvlAD6QZFWiLMOEvJ9g/tgZO1RwcAAA==",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "796"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "543"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_1.json
new file mode 100644
index 0000000000..ed69ae5e2b
--- /dev/null
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e62e8b58616125063f0f6c_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV224aMRD9lcrPgb0QLtq3DdCIikvEbpI2VYXM7iy48dor20tFIv69Y0xSoErVl7QPSItn5vjYM+f4mdB8Q0UGeV+Kgq1qRQ2TgkTPJKu1keWsAqE177NqDcrlpFwHIYm+frsgJROsrMuhoEsOOQZulDQyk5xEJB0nwSIkF8RwfVw+kTlgeDD8GN+OU7K7IEuaPdbVAYREBeUacJVhvoDMSGXpwFlYAc1vFBSgAOkjoIZMipyqrYXMOLIHlW4rG5oPb8ajfpwMU6STOVQ8ZWIUEyuN6LYCAQ0M8IcFoR+2G36rEfZSvx353SjsPmBpzvRjwp7g+opELb/pu5V7qvAeXs718XY8/rK4j+eT4QBLkJzaVna32MxBG7ygDcsBj0Sms+kQM1ZcLinvO8IJ8GJCBV1BnqypyhH39cQrJetqhDdAOl3ohNBbtnudoBOEbb/TKvyikyEaO4oXXb8TFtllD2jrMm9d2mZwugSuXfc4E4/285ms8SKxbm1MpSPPy7is80YOm2YpxUrmy2YmS49WzKOGU+1tQm9PRntvMfEODdBeBaqQqrQzFucbpqVq9CwRBXzfNF5gv/49A88NnaewJ1LBJ7nUr6ROSJwQOM7+n6y1oJVeS/M3nH/l7qxibWRwNaHfpbrDffZiJ72mT15jJ8vNDgYELe1ov9XKitb6SJkVM+daVlBxlu2tJakgc0P3h1ENe3bXutxrALMDC7HCamchrh5lwreGZfoAiYhCG8vOahSxJ4F/EO1odpNYyfooWVjqO8nrEg7mkKTxdBDPrVgFSrgva2FI5KMl0NrIJKN8L0I0RFlWtbWH382oUpAz9JQNnJ9cYz0M5A9xGtg5XtZIztF2GAOODmUX3+NorZ0lzKRiZkuirv3jPGnq2hzfJ8T560zw7XtdruvnYcvbZDGMk3QR7Gf0SQoYvT0cLTtzNudQ/ICfH1ylktL0QZnD7qNkfj2fzdLPAVYge/NS0p8P43Q0vbavE1j33o+mfbzcy3DexY2TxBz7QjUkW5RoiTDjNCG7nzALvNVDBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "795"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:27 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "515"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_enable_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e62e8b58616125063f0f6c_managedSlowMs_enable_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_enable_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e62e8b58616125063f0f6c_managedSlowMs_enable_1.json
index b498f9113c..ac470999bb 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_enable_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e62e8b58616125063f0f6c_managedSlowMs_enable_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/managedSlowMs/enable",
+  "Path": "/api/atlas/v2/groups/67e62e8b58616125063f0f6c/managedSlowMs/enable",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:38 GMT"
+      "Fri, 28 Mar 2025 05:15:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "67"
+      "70"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/memory.json b/test/e2e/.snapshots/TestPerformanceAdvisor/memory.json
index 29fbc54a46..19e5f7a9c6 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/memory.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/memory.json
@@ -1 +1 @@
-{"performanceAdvisorGenerateClusterName":"performanceAdvisor-837"}
\ No newline at end of file
+{"performanceAdvisorGenerateClusterName":"performanceAdvisor-82"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_1.json
index 88ab2d87b5..901f0ade90 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/AWS/endpointService/67e42d5b977b2776f7a74edf",
+  "Path": "/api/atlas/v2/groups/67e62e927062fc48ea34d3e7/privateEndpoint/AWS/endpointService/67e62e947062fc48ea34d45d",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:44 GMT"
+      "Fri, 28 Mar 2025 05:10:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "68"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_1.json
similarity index 65%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_1.json
index e00f7e1ee8..ad10216df5 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAC2PwWrDMBBE/2XPtolN7G1yU8CHQhoCLu0hhLCS1kFgS0FrO9DSf68SchyGeTNz+gUzhNkeY1ic5QhbUN8dZMDe3oLzU8dxcYYPNHLyTBgLGukneLpLsdwMF0I5k0x5+ZS5LCZf6bp8a3TDuq8saqwfvBhD/GARuiaQn4chA2cTskFeV7bWG0RdITY9Eq7Z9imT6jn2ZLh9jRHYns4ZRL664F+TOnVpVfd5KVNAJppmeXz4Uu97tdu38Hf+B5Af+8LjAAAA",
+  "Body": "H4sIAAAAAAAAAC2PzQrCMBCE32XPbSlpTa23Cj0IKkL9OYjIkmwl0CaSbSsovrtRPA7DfDNzfoHq3Kh33k1Gk4cFVKcGIiCr787YoSE/GUVb7Cl4yvUJ9vh0Fh+cTHdFycgxIQ+x+MmYJxWnErNUCNHKoixlVtKX573zG2LGWwDZsesiMDogZUFSUJkXqRStyueEWa7zmQ6ZUE++RUX1fwzD4nyJwNPNOPufdGiuddXsryIEeMBh5O+HY7VaV8t1De/LBxIjJgDjAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/AWS/endpointService",
+  "Path": "/api/atlas/v2/groups/67e62e927062fc48ea34d3e7/privateEndpoint/AWS/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "207"
+      "204"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:44 GMT"
+      "Fri, 28 Mar 2025 05:10:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "42"
+      "29"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_1.json
similarity index 65%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_1.json
index 63070f97f0..357ebdaa64 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD3MPQuDMBAG4P9ys0vFetQtg5QMlUKEDqVITE4JaFIu0aX0vzfQ0vX9eF5glrDZK4fdWWJoQNwUFEDePoPzSRHvzlCnV4LGb8uSK+bAF4pRz//M2fyskarSHscT4lgi1hNqrMhOmcsS8aQNtT83QnN/FMA0u+C/OigxtEL1wyEfYtJpyyOQneyl6GV3hvcHloq2A60AAAA=",
+  "Body": "H4sIAAAAAAAAAD3MuwrCMBQG4Hc5cweJsdVuHYpkMAiJOIiUkJyWQE3kJO0ivrsBxfW/fC+wc1zcmeLqHRK00F0VVIDBPaMPWSGt3qI0D4Q2LPNcKqJIJ0zJTP/Mu/KsG6wZHnizqdlo+R7Nlju+c4UrEtJoLPY/N0F7u1dAOPkYvjpc1NB3Sg+sHFI2eSkjEFJo0Wkhj/D+AN8roYytAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/AWS/endpointService/67e42d5b977b2776f7a74edf",
+  "Path": "/api/atlas/v2/groups/67e62e927062fc48ea34d3e7/privateEndpoint/AWS/endpointService/67e62e947062fc48ea34d45d",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "161"
+      "162"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:48 GMT"
+      "Fri, 28 Mar 2025 05:07:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "62"
+      "27"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_2.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_2.json
similarity index 62%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_2.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_2.json
index a160498974..0bb1fbeb8c 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_2.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_AWS_endpointService_67e62e947062fc48ea34d45d_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAC2PwWrDMBBE/2XPtqmN7W1yU8CHQloKDu0hhLCS1kFgS0Fru5DSf68SchyGeTPzC2YMi/2MYXWWI2xBffeQAXt7Dc7PPcfVGf6giZNnwlTQRLfg6UeK9Wq4EMqZZM7Lh8xlNfmLbsrXVresh8qixubOizHEdxahSwL5ZRwzcDYhW+S6so3eIOoKsR2QsGY7pEyq5ziQ4e45RmB7PGUQ+eKCf07q1blT/eFcpoDMNC9y//Cl3vZqt+/g7x8OwIpZ4QAAAA==",
+  "Body": "H4sIAAAAAAAAAC2PzQrCMBCE32XPbSlpTa23Cj0IKkL9OYjIkmwl0CaSbSsovrtRPA7DfDPzAtW5Ue+8m4wmDwuoTg1EQFbfnbFDQ34yirbYU/CU6xPs8eksPjiZ7oqSkWNCHmLxkzFPKk4lZqkQopVFWcqspC/Pe+c3xIy3ALJj10VgdEDKgqSgMi9SKVqVzwmzXOczHTKhnnyLiur/GIbF+RKBp5tx9j/p0FzrqtlfRQjwgMPI3w/HarWulusa3h+y5UlT4QAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/AWS/endpointService/67e42d5b977b2776f7a74edf",
+  "Path": "/api/atlas/v2/groups/67e62e927062fc48ea34d3e7/privateEndpoint/AWS/endpointService/67e62e947062fc48ea34d45d",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "205"
+      "202"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:44 GMT"
+      "Fri, 28 Mar 2025 05:10:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "41"
+      "33"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
index a0dc374d95..0e7c63a7c3 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsU7DMBBA/8VzUqduEpdsFWJgBoQEYrj6Lq2FY0c+pwxV/51UFYUuKEvme3r3pNMdhXEDJ4r3YfBJNEUmTCRIhKIRqlBVXqxyVT8v62alm1K/iUzY86zWVCqs4E7rrdK6bjXoEnE5zp31nyya96PYR2pHdp9Sz42UxoUBc6TDogt+F3C7MKGT0FsJyQHLg5K7GIae5T/2SG5UMrlWnLIZVkgTfALrKfJ12439xvwHnqnmcp5JLT/oPCUICbbA9MLTcm75eZp6mtZy4WZqiMEQM03quLLztHztbSJnOU1o+WVPH5nw0NGI99Eexu9/8NgH6xNvXp9yUpRXy/WoDHH3eH7+ilqEeq1g1SpCRRqxNkilOH0Dx7wWhlAEAAA=",
+  "Body": "H4sIAAAAAAAAALWTTUvEMBBA/0vO7aamn/Ym4sGziqB4yCbTNpgmIZPWw9L/bpbF1V6kl57n8ebBMCci9IQB/L2dTCBtlhDhgQeQpCUsY2Wa5SlrnrOyzeo2Z28kIeo8q2qoGNyyOqtYJ4oGeF7IHOo418p8ImnfT2Tw0EV2CMFhS6nQdpKphPkwWtNbeTwIO1LuFOVBc6Qzo723k0P6j92DjkoE3ZEl2WEFFdYErgx4vG5b2VfmP/BONZfzbGr5QfcpkTzwI0d4wW05a36fJgfbWi7cTg3eCkCETR1Xdp+Wr0EF0ArDhpZfdvlIiOEjRNx5NcfvfzDSWWUC3r0+pcAgvWmKqLS+fzw/fwmd5FXDeN4xkAxqKSshoSDLN8yu0gBQBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "296"
+      "294"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:46 GMT"
+      "Fri, 28 Mar 2025 05:07:30 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1317"
+      "1960"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_endpointService_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_endpointService_1.json
index 359e5bf6b1..333e41ab91 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e62e927062fc48ea34d3e7_privateEndpoint_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD3MPQuDMBAG4P9ys0vFetQtg5QMlUKEDqVITE4JaFIu0aX0vzfQ0vX9eF5glrDZK4fdWWJoQNwUFEDePoPzSRHvzlCnV4LGb8uSK+bAF4pRz//M2fyskarSHscT4lgi1hNqrMhOmcsS8aQNtT83QnN/FMA0u+C/OigxtEL1wyEfYtJpyyOQneyl6GV3hvcHloq2A60AAAA=",
+  "Body": "H4sIAAAAAAAAAD3MuwrCMBQG4Hc5cweJsdVuHYpkMAiJOIiUkJyWQE3kJO0ivrsBxfW/fC+wc1zcmeLqHRK00F0VVIDBPaMPWSGt3qI0D4Q2LPNcKqJIJ0zJTP/Mu/KsG6wZHnizqdlo+R7Nlju+c4UrEtJoLPY/N0F7u1dAOPkYvjpc1NB3Sg+sHFI2eSkjEFJo0Wkhj/D+AN8roYytAAAA",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/endpointService",
+  "Path": "/api/atlas/v2/groups/67e62e927062fc48ea34d3e7/privateEndpoint/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "161"
+      "162"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:47 GMT"
+      "Fri, 28 Mar 2025 05:07:32 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "147"
+      "99"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/memory.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/memory.json
index 979e425be1..deb70ce921 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/memory.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/memory.json
@@ -1 +1 @@
-{"rand":"BA=="}
\ No newline at end of file
+{"rand":"AQ=="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_1.json
similarity index 77%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_1.json
index 6ed1dd855b..a2e515bec3 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/AZURE/endpointService/67e42e0fadba6513a8c6126b",
+  "Path": "/api/atlas/v2/groups/67e62f3858616125063f1a6f/privateEndpoint/AZURE/endpointService/67e62f397062fc48ea34dcd1",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:41:49 GMT"
+      "Fri, 28 Mar 2025 05:11:11 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "55"
+      "61"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_1.json
index 191590d11d..c57543b640 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAIWRT2vDMAzFv4vPzdzWcdLllkHYCv1HtvawUoprq8VrFhvJzg5j330plDEYo1dJ7+mnp+0n042LZoWuswaQFax8XdcVGzBAdDgHInUCVrSxaQbMmn4gyyEdw/CozEFlciTURGejcXboNR5tpwJUrfHOtoFYsd39VGe2PT8DdlbDQr33nsw3tL/t9ktXA7mIGqYXDk7xQBqtD9a1xFMYCWGETCAXaZKKyTBRMpOJHt6nUgpplMg5Xg0e0UVPHE//7df7LqKKZ3rj/poN8bnV6Mgdw90CwofDM/+LSPzGVQinnveaQLWul6tqv1jWL099j4IKkS5P2JTTWfkwq9jX7hvgTEPIpAEAAA==",
+  "Body": "H4sIAAAAAAAAAIVRXWvDMAz8L35u5rbOV/OWQdgKaVqytQ8rpXi2GkyyOEh2Nxj770uhjMEYfRJIutPdaf/JVGe93qA9Gw3IMpa/bOuCTRggWlwBkWyAZb3vugkzelyIE4jnJ7FIpmNRYQpShFrp2YgZ0Jylg6LXgzW9I5btDz/d0vTtE+DZKKjk28jJho6Ot9l+4Wog61HB8qKDk38lhWZwxvbEQ5gJoUUUQCLCIBTpNJBRHAVqugijSERaioTjleABrR+IY/Pf/fkx9Uq1uvngwzUb4iuj0JI9ubsK3LvFlv+VSPyGK4Rm1HtNoNjW601xrNb18+M4Iyedp8sTdvmyzO/Lgn0dvgGkk9ucpAEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/AZURE/endpointService",
+  "Path": "/api/atlas/v2/groups/67e62f3858616125063f1a6f/privateEndpoint/AZURE/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:41:49 GMT"
+      "Fri, 28 Mar 2025 05:11:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "58"
+      "35"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_1.json
index 13074d2df7..83da2da691 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWNsQ6CMBRF/+XNDIKKho2BaBMFgrBojCn0SRqxJa8ti/HfbWJkcb33nnte0A3aiZL0JAUSJJCemyqDAJBI0xGN4T1CotwwBCCFH8QbXEW4uHPR8ngdLvm2i8Mobj0zkpy4xUyJUUtlDSSX65wepHqckCbZYc6f8+d/W6HRjjpk4rch7KVWXwqypirK7JYXVb33TmO5dd4ELGc1S2uW7+D9AfVgbufXAAAA",
+  "Body": "H4sIAAAAAAAAAGWNMQvCMBSE/8ubO6iVVrt1KBrQtsR2UURC8izBmpSXtIv43w2IXZwO7r67e4Hs7ahqspNWSJBBfm55AREgkaUjOic6hMyMfR+BVgFIUkxW93ibLoLI9QZFvFZSLUNnID0Jj4VRg9XGO8gu19k9aPM4IU1aYime8+Z/ytHZkSQy9WMIO23NtwVFy6u6uJUVb/bh03nhx/AErGQNyxtW7uD9AUcTcDfXAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/AZURE/endpointService/67e42e0fadba6513a8c6126b",
+  "Path": "/api/atlas/v2/groups/67e62f3858616125063f1a6f/privateEndpoint/AZURE/endpointService/67e62f397062fc48ea34dcd1",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:47 GMT"
+      "Fri, 28 Mar 2025 05:10:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "47"
+      "37"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_2.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_2.json
similarity index 59%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_2.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_2.json
index 649ac568e7..22071fd49e 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_2.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_AZURE_endpointService_67e62f397062fc48ea34dcd1_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAIWRT0/DMAzFv0vOK1mXphu9FamCSfunwnYAoSpNvCqsNJWdlAPiu9NJE0JCaFfb7/nn50+mWxfMDt1gDSDLWP68Lws2YYDocA1EqgGWdaFtJ8yacSCdQzKD6VGZWqUyFmqh03iW1qOmRzsoD0Vnemc7Tyx7ef2prmx3egQcrIaNeh89Wd9Sdd3tl64EcgE1LM8cnEJNGm3vreuIJxALYYSMYC6SKBGLaaRkKiM9vU2kFNIoMed4MbhHF3ri2Py3X1dDQBVO9Mb7SzbE11ajI3f0NxvwHw5P/C8i8StXITQj7yWBYl9ud0W12ZZPD2OPvPKBzk845MtVfrcq2Nc3T6n4F6IBAAA=",
+  "Body": "H4sIAAAAAAAAAIVRXWvDMAz8L35u5rTOV/uWQdgKbVqytQ8bo3i2GkyzOEh2Nhj773OhjMEYfRJIutPd6ZOpznq9RTsaDcgWrHzaNRWbMEC0uAYi2QJb9L7rJszosJDlkM2OYp7HoaikACkSrfQ0YAY0o3RQ9XqwpnfEFs8vP92V6U8PgKNRUMu3wMmGjg7X2X7hGiDrUcHyrIOTfyWFZnDG9sQTmAqhRRpBLpIoEUUcyTRLIxXPkzQVqZYi53ghuEPrB+LY/nd/dii8UifdfvDhkg3xtVFoyR7dTQ3u3eKJ/5VI/IorhDbovSRQ7ZrNtjrUm+bxPszISefp/IR9uVyVt6uKfX0DucRwUaIBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/AZURE/endpointService/67e42e0fadba6513a8c6126b",
+  "Path": "/api/atlas/v2/groups/67e62f3858616125063f1a6f/privateEndpoint/AZURE/endpointService/67e62f397062fc48ea34dcd1",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:41:48 GMT"
+      "Fri, 28 Mar 2025 05:11:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "39"
+      "23"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_1.json
index 91a9b2eb00..aae5bae5f4 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGDAQWxR1aF7u7TqcNhHYtWxkc9QqRH/XqKoaVkqFuZ7evek012YsgNFDA9+cJE1WcJUQIioWcNEJqo0K1Ihn3PZlFlTyleWMHOdyT2WAjMFugVZ5QXUSuZ5V81za9wHsebtwk4Bu5k9xdhTw7myftCpxnF39u7odbtT/syhNxyiBeKj4Mfgh574P/aAdlYS2o5NyQYruPIugnEY6L5tYV+Y/8Ab1dzOs6rlB92mREOEFghfaF3Okt+mqcd1LTduo4bgFRLhqo47u03L58lEtIbiipZfdnpPmIMzzngfzDh//6PTvTcu0uFrCJiiwDSv81nqw/Hp+v4VdhpkLaDoBGqBe62l0liy6RuU3RUcUgQAAA==",
+  "Body": "H4sIAAAAAAAAALWTwU6EMBBA/6Vn2EKRgtyM8eBdLxoP3XYKzZaWdAombvh32Wxc5WK4cJ6XNy+ZzJlIO2KE8OhHF0mTJUQGEBEUaQjLWJlmRcrql6xs8qzJqzeSEHOZ8Qo400Vd1jznOSszXuhccL3MrXEnJM37mXQB9MJ2MQ7YUCqtH1WqYDr03rVeHQ/S91QMhopoBdKJ0Tb4cUD6jz2AXZQIVpM52WEFld5FYRwEvG1b2VfmP/BONdfzbGr5QfcpUSKKo0B4xW05a36fpgG2tVy5nRqCl4AImzpu7D4tn52JYA3GDS2/7PyRECd6WPAhmGn5/ienBm9cxIevMUAKDNKc3S9SH9rny/uXoJXgNROFZqAYVEpxqeCOzN8dDZdoUgQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:44 GMT"
+      "Fri, 28 Mar 2025 05:10:16 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2055"
+      "1230"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_endpointService_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_endpointService_1.json
index 83810e7b0c..93c2f2636e 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e62f3858616125063f1a6f_privateEndpoint_endpointService_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWNsQ6CMBRF/+XNDIKKho2BaBMFgrBojCn0SRqxJa8ti/HfbWJkcb33nnte0A3aiZL0JAUSJJCemyqDAJBI0xGN4T1CotwwBCCFH8QbXEW4uHPR8ngdLvm2i8Mobj0zkpy4xUyJUUtlDSSX65wepHqckCbZYc6f8+d/W6HRjjpk4rch7KVWXwqypirK7JYXVb33TmO5dd4ELGc1S2uW7+D9AfVgbufXAAAA",
+  "Body": "H4sIAAAAAAAAAGWNMQvCMBSE/8ubO6iVVrt1KBrQtsR2UURC8izBmpSXtIv43w2IXZwO7r67e4Hs7ahqspNWSJBBfm55AREgkaUjOic6hMyMfR+BVgFIUkxW93ibLoLI9QZFvFZSLUNnID0Jj4VRg9XGO8gu19k9aPM4IU1aYime8+Z/ytHZkSQy9WMIO23NtwVFy6u6uJUVb/bh03nhx/AErGQNyxtW7uD9AUcTcDfXAAAA",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/endpointService",
+  "Path": "/api/atlas/v2/groups/67e62f3858616125063f1a6f/privateEndpoint/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:40:47 GMT"
+      "Fri, 28 Mar 2025 05:10:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "113"
+      "129"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_1.json
index ce9bf63178..1b550c8582 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
+  "Path": "/api/atlas/v2/groups/67e62f6f7062fc48ea34de6b/privateEndpoint/GCP/endpointService/67e62f727062fc48ea34dee9",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:38 GMT"
+      "Fri, 28 Mar 2025 05:15:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "65"
+      "62"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_2.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_2.json
deleted file mode 100644
index ec9e3c9841..0000000000
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_2.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAGWPQWvDMAyF/4vODSFuGne5lRJCYMtCyU5jFNdWU480TiU7MMb++zzKLttFB+m9T+99gh5dMB25xRokKKHed7ACnMzs7ORrcmFu1RUZyte3uCdy9ITMakAopzCOK7Am2gqJucCNUOakik22VltdZDJXkUU4WDf9QKKuejk8d9VxX7X9Yfd4FPHOSIvVuPNe6csVJ//7D2Zy76g9p3MysGC/EPkxoDT2Y3szdDE3k97pnGIgN2Oio5/UKNJ/VE5ZJX9UyT12bh6kPAkpi7NUceTrJIPYlr3yISaBpm36Ztc3bQ1f38q1RRQzAQAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "246"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:08 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "54"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasPrivateEndpointResource::getEndPointService"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_3.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_3.json
deleted file mode 100644
index 6e4b881f0b..0000000000
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMWSwW6DMBBE/2XPQRRDcMoNRQghtRRF9FRVkWNviSuCydpGqqr+e11FvbQfwGUPuzPz9jCfIEfjVUdm0QoJCqj3HWwAJzUbPbmajJ9bcUELxctr2BMZekRrxYBQTH4cN6BVsOUcM4ZbJtRJ5NskFTuZJzwTIYtw0Gb6CQm66vnw1FXHfdX2h/LhyMLdIi1aYumckOcLTu6XBzOZd5TOxnM0WGbdQuRGj1zpj91V0VldVXxLtzF6MjNGMvhJjCz+l2pjK6I/quj2dqbuOT8xzvM3LsLI0uguPLYiPlkXz9bFpxCqZp1wPtQAmrbpm7Jv2hq+vgHNK/0ysAIAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "262"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:33 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "35"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasPrivateEndpointResource::getEndPointService"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_4.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_4.json
deleted file mode 100644
index f413a64e74..0000000000
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_4.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMWTzU7DMBCE32XPjUKcH5fcQhVVldISVcAFocq1l9QojdO1HQkh3h2jigt9gFz2sDsz317mC2RvvGrJTFohQQnrVQsLwEGNRg9uTcaPO3FGC+XrW9gTGdqitaJDKAff9wvQKtgKjhnDnAl1FEWepGIpi4RnImQRdtoMvyFBVz/vH9v6sKp3T/uqObBwt0iTllg5J+TpjIP748FI5gOls/EYdZZZNxG53iNX+nN5UXRSFxVf022MnsyIkQx+Ej2Lb1JtbEX0TxVd387UPedHxnnxzkUYWRrdhcdmxCfz4tm8+HRefDYvPodQNOuE86EEUL1Um6Z6aGr4/gF3+6nirQMAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "268"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:37 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "40"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasPrivateEndpointResource::getEndPointService"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_1.json
index b370aeb305..7b26ce0b06 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTzU7DMBCE32XPjUKcH5fcQhVVSKFEFXCpqsq1l9QojdO1HQkh3h2jigt9gFz2sDsz315m9wWyN161ZCatkKCE9aqFBeCgRqMHtybjx404o4Vytw97IkNPaK3oEMrB9/0CtAq2gmPGMGdCHUWRJ6lYyiLhmQhZhJ02w29I0NWv2+e2Pqzqzcu2ag4s3C3SpCVWzgl5OuPg/ngwkvlA6Ww8Rp1l1k1ErvfIlf5cXhSd1EXF13QboyczYiSDn0TP4ptUG1sR/VNF17czdc/5kXFevHMRRpZGd+GxGfHJvHg2Lz6dF5/Ni88hFM064XwoAVRv1WNTPTQ1fO9/AECaGbmvAwAA",
+  "Body": "H4sIAAAAAAAAAL2TT2vDMAzFv4vONUmTzNlyy0Ypg24Uuj+HUoprK1lCEgfLThfGvvs8Sg9jd58EetL7vYO0/wLZaae2Rk+NQgMFrB+2sAAc1Kibwa6NduOz6JGg2B983xhtnpBI1AjF4LpuAY3yazxHnlR5kse+yOwWRZopxDvvZbBu9PBr4uded8f31e7lmHiB0EyNxNJaIT96HOwVBKPRLUpL0chkOp/O/We8zMe5lbyuJkpbzefoYkuRI3ZGskn0z44iEuwqs0tCXv1NyE8s9lGCApehgUloYBoamIUG3oD/BrLCOn+wUL6Vj5vyfrOC78MPUBR+MFQDAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService",
+  "Path": "/api/atlas/v2/groups/67e62f6f7062fc48ea34de6b/privateEndpoint/GCP/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "270"
+      "254"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:37 GMT"
+      "Fri, 28 Mar 2025 05:15:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "56"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_1.json
index 8debad8d61..101003cd96 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE2NOwuDMBSF/8udXWp9FDcRkUCbitipFLlNLjagieThUvrfm27dDufxnTeIxQTZW7MrSRYq6JoeEiAtN6O076wJG8eVHFT3R/StNfZCzuFMUOmwLAkoGWdFSVlKeYryiUV+OOJJFIcyw8iyNCujf5DYa2/DtW+npuXjUJ+nNOaO7K4E1d6jeK2k/d+f8+hD1MA4G1k9Mt7B5wuoxirutQAAAA==",
+  "Body": "H4sIAAAAAAAAAE1NPQvCMBD9Lzd3kFoa7VZESgZLoRUHkRKSswbapFySLuJ/99yc3uN9vkHPPpmO/GYNElTQnDrIAJ1ZvXWxIZ/WVi0YoLo/WCfydMEQ1IRQuTTPGVjDtVJgmT9FLnYMujig2hcG8chbhJP17jfCuWs/3s79MOZsBKTNaqxjVPq1oIt/RyGqmJiDbOUg60G2DXy+A+wMia4AAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
+  "Path": "/api/atlas/v2/groups/67e62f6f7062fc48ea34de6b/privateEndpoint/GCP/endpointService/67e62f727062fc48ea34dee9",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "172"
+      "164"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:41:54 GMT"
+      "Fri, 28 Mar 2025 05:11:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "45"
+      "29"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_2.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_2.json
new file mode 100644
index 0000000000..fd522c5988
--- /dev/null
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_2.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL2QQWvDMAyF/4vONemS1tlyK2OEHBYKzdhhjOLaSpaQ2May04ax/z6P0sPYfSeBnvS9J32CHE1Qe2fmXqGDAsrHPawAtbKm1750JthaTEhQvL3HvnPGPSOR6BAKHcZxBb2KazxHnrZ5mq9jkZt7FNlGIT5ElsOuN/oHEudeDsfXp0NzTKNA6OZe4s57IT8m1P5mBNaZAaWnxDKZLafzdFnf5XYZJO/ambLB8CW5YikJxM5IPk3+4CghwW4yuybk7e+E/MSyGOVfDbcQP0le+BCPhaqummrXVHUJX9/sOmdgjwEAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62f6f7062fc48ea34de6b/privateEndpoint/GCP/endpointService/67e62f727062fc48ea34dee9",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "238"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:14:57 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "31"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasPrivateEndpointResource::getEndPointService"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_3.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_3.json
new file mode 100644
index 0000000000..07b5252dcf
--- /dev/null
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_GCP_endpointService_67e62f727062fc48ea34dee9_3.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL2TT2vDMAzFv4vODU6dzNlyy0YphW4Uuj+HMYrrKGlCYgfLThfGvvs8Sg9j95wEetL7vYP0BaozvtxZMzYlWshh/bCDBaAuB9Not7bGD0+yR4L8/SP0rTX2EYlkjZBr33ULaMqwJjIUvMp4Foei0luUSVoi3gUvi3Vj9K9JmHvZH95W++cDDwKhHRuFhXNSnXrU7gqCwZoWlSM2RCqZjuf+M15mw9QqUVcjJa0RE7vYEvMUnZEcZ//siJGMrnJ0SSiqvwnFMYpDlFmBy7mBfG5gMjcwnRt4A+EbyEnnw8FC8VpstsX9dgXfP2cDCeFSAwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62f6f7062fc48ea34de6b/privateEndpoint/GCP/endpointService/67e62f727062fc48ea34dee9",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "252"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:09 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "28"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasPrivateEndpointResource::getEndPointService"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_1.json
index ceb8f71803..7236e60cd5 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW7DIBBA/4XZDgkmpmWNqqpbh3Zp1QHD2UHFYHHYHaL8e4mipvVSefHCck/vnoTuRLQbMUE8hNEnIrcF0RFUAkMkYVu2L7dVyeqXXS35Tu75GymIvcxqAZwBN/dCNEyIuhUqP7zKc2f9JxL5fiLHCG1mjykNKCnVLoymNDBt+uC7YJqNDj1Vg6UqOYV0YrSLYRyQ/mOP4LISwbXkXKywgurgk7IeIt62zewz8x94pZrr9yxq+UHXKTEqqUYhvOKynDm/TtMAy1qu3EoNMWhAhEUdN3adlq+jTeAspgUtv+z5oyBe9ZDxIdopX/+DN0OwPuHj86EEBmVV8awMsXu6HP8eWqPqO6aqloFhIIyptQFOzt/r7NMbUAQAAA==",
+  "Body": "H4sIAAAAAAAAALWTu26EMBAA/8U1nME8RXuKonQpkiZRCmMvYMXYyGtIceLf49Mpl9BENFQudjQ7krUXIvSMHtzZzsaTJomIcMA9SNIQlrAiTrKY1S9J0aRpk2ZvJCLqOisrKFlXdlUSHpHXwLNcQtmGuVbmE0nzfiGDgy6wg/cTNpQKbWcZS1hOozW9le1J2JHySVHuNUe6MNo7O09I/7E70EGJoDuyRgesoMIaz5UBh/dtG/vG/Ac+qOb2PbtaftBjSiT3vOUIr7gvZ8sf0zTBvpYbd1CDswIQYVfHnT2m5WtQHrRCv6Pll10/ImL4CAGfnFrC9T8YOVllPD4+n2NgELOUBaV1/dP1+AvoJC9rxrOOgWRQSVkKCTlZvwEf6xziUAQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:41:49 GMT"
+      "Fri, 28 Mar 2025 05:11:11 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "4954"
+      "2653"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_endpointService_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_endpointService_1.json
index bb5b5a5f88..097dd37dc6 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e62f6f7062fc48ea34de6b_privateEndpoint_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE2NOwuDMBSF/8udXWp9FDcRkUCbitipFLlNLjagieThUvrfm27dDufxnTeIxQTZW7MrSRYq6JoeEiAtN6O076wJG8eVHFT3R/StNfZCzuFMUOmwLAkoGWdFSVlKeYryiUV+OOJJFIcyw8iyNCujf5DYa2/DtW+npuXjUJ+nNOaO7K4E1d6jeK2k/d+f8+hD1MA4G1k9Mt7B5wuoxirutQAAAA==",
+  "Body": "H4sIAAAAAAAAAE1NPQvCMBD9Lzd3kFoa7VZESgZLoRUHkRKSswbapFySLuJ/99yc3uN9vkHPPpmO/GYNElTQnDrIAJ1ZvXWxIZ/WVi0YoLo/WCfydMEQ1IRQuTTPGVjDtVJgmT9FLnYMujig2hcG8chbhJP17jfCuWs/3s79MOZsBKTNaqxjVPq1oIt/RyGqmJiDbOUg60G2DXy+A+wMia4AAAA=",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/endpointService",
+  "Path": "/api/atlas/v2/groups/67e62f6f7062fc48ea34de6b/privateEndpoint/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "172"
+      "164"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:41:54 GMT"
+      "Fri, 28 Mar 2025 05:11:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "175"
+      "196"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/memory.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/memory.json
index aa5e584caf..c5c44de530 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/memory.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/memory.json
@@ -1 +1 @@
-{"rand":"Cw=="}
\ No newline at end of file
+{"rand":"BQ=="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_1.json
deleted file mode 100644
index c32d1d722b..0000000000
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfCyGhkDVvKdCKiY+KpO3Waaqc5AJeHTuyHSZa8d93jdMPmDbtpdtDpMT3nuNj33tunggtNlTkUAykWLJVrahhUpDoieS1NrKcVyC05gNWrUG5nJRrPyDR128npGSClXU5EjTjUGDgSkkjc8lJRNJJ4t8H5IQYrt/Cp7IADA9HF/H1JCW7E5LR/KGuGhISLSnXgKsM8wXkRiorB47CCmhxpWAJClA+EmrIpSio2lrKnKN6UOm2sqHF6GoyHsTJKEU5uWPFUyZGMbHSyG4RSGhgiA8Cgk7Qa3W6raCf+v2oG0a90zuEFkw/JOwRLs9J1O20O27lliq8h+dzXVxPJl/ub+PFdDRECIpT28ruFpsFaIMXtGEF4JHIbD4bYcaKy4zygROcAF9OqaArKJI1VQXyvpx4pWRdjfEGSD+E06DoLWmR0X7P79KPuf0IkY29xvvBWRhmQRj2lyENe/5phnFOM+DaVY8z8WBfn8gaLxJxa2MqHXlezmVdtArYtEspVrLI2rksPVoxjxpOtbcJvL0Y7f1OidcUQHuVkjloDbrVP+sRWze+LxZfYp3+3c6eazJPYQ2kgk8y0y9iDjY/2Pht9v9QqwWt9Fqav9H6mruzzrSR4fmUfpfqBvn3piYf2x3yEjtYbvcxIGhpW/i4ZBWt9RvnVcwce1VBxVm+Hx1JBblrqret6B+2YtfKEHW573HM9i3FCtFuRDg82oBvDct1Q4mMQhs7rKwHkXvqdxpTjudXibVkBy0Jmb6RvC6hMX+SxrNhvLBmFGjRgayFIVEHLU9rI5Oc8r3JcODJsqqt/X8dNpWCguHM2MDxyTXiYSh/iMPAzumyg+KYbYcx4DiB7OJ7HK27s4KZVMxsSRTaDzdzZq688W1C3PycC759r8t19Wy2vE7uR3GS3vv73nyUAsZ/aI4z4nIa8B2+fnBIJaUZgDLN7uNkcbmYz9PPPiJQvXmGDBajOB3PLu3fh66acYc2wzm9b1L7m3L/gON6bpwpFlghqiHZojlLJJykCdn9BAw/+2YtBwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/clusters/processes-695",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "798"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_2.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_2.json
deleted file mode 100644
index 143360cc20..0000000000
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfG1g/HViMgGFzbLTzYcWApTddhCCjpbLOhSIGkXKiB//ceRaWJ3bUYBnQFbEDS8R6Pd+89PhBa7KnIoZhIsWHbWlHDpCDxA8lrbWS5qkBozSes2oFya1Kug5DEf/19RkomWFmXM0EzDgUGrpU0MpecxCRdJMFdSM6I4fp5+lIWgOHp7M34ZpGSwxnJaH5fVx0IiTeUa8CvDNcLyI1Uthw4CSugxbWCDSjA8hFQQy5FQVVjIXOO1YNKm8qG1rPrxXwyTmYplpM7VDxlYhQTW23RtaE2F+FJKcVWFlnseZWSOWgNuje6GPb0DuM938dfvxAZ2/a7lb0C9n0BJg4jP4jOvpcV/Kes8EdZ3u84mkujanhBa7NLZK1yuKQFjuWFgoqznCZgLqnhVPd2TcPr6BEaG/F45kTtn479Uqv96dH/uYS2zTgFA1P8I0Loh8OeP+iFozQYxYMoHp5/wG0Kpu8T9hnevibxwO/77sstVVjlIxne3CwWf97djtfL2RRTcKKqqeyIxmYN2iCr9qwA5AG5Wl3NcMWWy4zyiZtyAnyzpIJuoUjs6RD3K022StbV3M51FMF5WAw3tMjoaBgM6KvcvkSIxp7io/AiirIwikabiEbD4DzDOKcZcO0oz5m4t48PZIfsw7ydMZXGluVc1kXbnK5R/VyWHq2Y1/bf24deW4z2vleJ17FWH7efWLLzluF8g13//3b2nDI9hTOQCv6Qmf5azNHmRxs/X/0rqtWCVnonzb+p9WntwdqZjUxfL+lHqd4hfuuE5FXfqqWLHX3ujzAgaGkpfDqyitb6mV1VzJwaXKfQ1okqyB2pnlMxOKbiwJYh6rLlOK4OLMQWs52vunyUAW8My3UHiYjCCj0Hq0HEXgZ+J8r56jqxkvRRkpDpd5LXJXSOmaTjq+l4bcUoUKITWQtDYh8lj0Yjk5zyVmR4S8iyqq38v3XoSkHB0Gj3cHpyjfkwlZ/EceDg6rJGcYp2wBhwtG378WccbXCwBTOpmGlIHNkX5zlXbrzj24S4S2clePOzmuvm2W15k9zNxkl6F7Tc/CwFzH9Ajgvi1nTJH/DxN5eppDQTUKbbfZ6s365Xq/R94O4A85gyny6stRq67awOJYYe3RLU3uvu0jyd5d4JYo3ToRqSBoVZItgiTcjhC4gJgBFeCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/clusters/processes-695",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "900"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:12 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "83"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_provider_regions_1.json
deleted file mode 100644
index 544401628d..0000000000
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0se+uSM9ToKZRTpcOANqzgYItGe1rC0KUnqw8T/vlgRdUqbPZ7Tr+d8yUlyQIym3xI5Xwe0ExAhB+2UyqSD8ZbxPHwJYV9PeBrzcFPf8gSTjGKiGJF438Sx4HkmcbcH7WbYiUi4Id2O3SKv21PQ0yVyqUBInAm+pyEILCCmPJVvNNXfQujzPFWuEjlYF0S63jKwFAXhjuyGlZEYxnni2hZVkMgpiKnOuHajgWpIANPCEliEjqtTKHOmzouhqVQk3UJAf+CcIXtCGdkwmJ0dimQIEdH/IOfkUEMpSUBXXARr3wvmaxsdazdMRJh8hJoV0NJ/rPS3W8GUFup7674/ns+8YbmVv1iPJ7P5oJJ6pvUcKvW6QK0KyFT+wpU2DTyD+XhTMyiYLOaD6knekaWrvSPbFWQxLCPPK1nleSXNPY12yZAq9Rv5ZmdBcyY9300ofa7+Q5X6fwzN/PWFrb5idyPoGJO90o37vBVcXfN2owgvD+2p6DIoUoorwoq3GDn28RcJMc+GFAYAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "412"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:53 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_processes-244_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_processes-244_1.json
new file mode 100644
index 0000000000..ad280151c6
--- /dev/null
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_processes-244_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV72/aMBD9VyZ/bkkIg1b5lgKtmPhRkbTdOk2V4xzg1bEj22GiFf/7zjjtgGnVvnSTQEp8956fffcuz4QWayoZFH0lF3xZa2q5kiR+Jqw2VpWzCqQxos+rFWifkwnTjkj89dsJKbnkZV0OJc0FFBi41soqpgSJSTZO2w8ROSFWmH34RBWA4cHwMrkZZ2R7QnLKHuuqISHxggoDuMoxXwKzSjs5cBTWQItrDQvQgPKR0ABTsqB64yiZQPWgs03lQvPh9XjUT9JhhnKYZ8VTplZzuTTI7hBIaGGAfwREYdQ9DTun0XkWduPwDH/3CC24eUz5E1xdkLgTtkK/ckc13sPLuS5vxuMvD3fJfDIcIATF6U3ldkvsHIzFC1rzAvBIZDqbDjFjKVRORd8LTkEsJlTSJRTpiuoCeV9PvNSqrkZ4A6R3Br0Izs675712rx11w15nEeash2x8L54fxFmvg3FBcxDGV09w+egen8kKLxJxK2srEwcBE6ouTgtYt0oll6rIW0yVAa14QK2gJlhHwU6MCf6kJGgKYIJKKwbGgDmNPn4krm5iVyyxwDr9u50D32SBxhooDZ9Ubl7FHGx+sPF+9v9QayStzErZv9H6K3frnOkig4sJ/a70LfLvTE3OWyF5jR0st1zzSFq6Fj4uWUVrs+e8ittjr2qoBGe70ZFWwHxTvdGKXdeKsi53PY7ZbUexRLQfER6PNhAby5lpKJFRGuuGlfMgck/aYWPK0ew6dZYM0ZKQm1sl6hIa86dZMh0kc2dGiRbtq1paEodoeVpblTIqdibDgafKqnb2/33YVBoKjjNjDccnN4iHgfohDwNbr8sNimO2LcZA4ARyi+9xtM7WCeZKc7sh8Zl78TNn6sub3KXEz8+ZFJv3ulxfz2bLm/RhmKTZQ3vXm09KwuiN5siJz2nA9/j4wSO1UrYP2ja7j9L51Xw2yz63EYHq7QukPx8m2Wh65b4+dNmMO7QZzuldk7rPlP8GHNdz7U0xxwpRA+kGzVki4ThLyfYngTsO4i0HAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e7858616125063f0bc6/clusters/processes-244",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "785"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:08 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "70"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_processes-244_2.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_processes-244_2.json
new file mode 100644
index 0000000000..ad02d50ceb
--- /dev/null
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_processes-244_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV74/aOBD9V07+0C9dyA8KrCKtKgq04gTLimS7bU+nleMM4K5jR7ZDS1f87x3H2Xah19XppF6lIIWM53k8897zPaHFjkoGxVjJNd/UmlquJEnuCauNVeWyAmmMGPNqC9qvyYSJYpL89fcZKbnkZV1OJc0FFBi40soqpgRJSDZPo9uYnBErzOP0hSoAw5Pp69H1PCOHM5JTdldXLQhJ1lQYwK8c10tgVmlXDpyENdDiSsMaNGD5CGiAKVlQvXeQTGD1oLN95UKr6dV8Nh6l0wzLYR4VT5lazeXGOHRjqctFeFIquVFFngRBpRUDY8B04hcvOmaL8U4Y4tPtfe6vdbdd2Slg15Vgk3gYRsOzn2VF/ykrfioreImjubC6hme0tttU1ZrBBS1wLM80VIIzmoK9oFZQ09G9cPt5/QCNjXg4c6p334/93Ojd6dH/uYSmzTgFCxP8IUIcxv1O2OvE51nYT8IhPh9wm4Kbu5R/gTevSNILu6H/ckM1VvlAhtfX8/n725vRajGdYApOVO8rN6KRXYGxyKodLwB5QC6Xl1NcsREqp2Lsp5yCWC+opBsoUnc6xP1Gk41WdTVzcx0MYRDD8Lx/PogGUdwPB711mLMBovFH8fwozgY9jAuagzCe8oLLO/d6T7bIPszbWlsZbBkTqi6a5rSN6jJVBrTiQdP/YBcHTTEm+FklQctac9x+4sguGoaLNXb9/9s58MoMNM5AafhT5eZbMUebH238ePXvqNZIWpmtsv+m1u9rD87OXGTyakE/Kv0W8RsnJOddp5Y2dvS568gjaekofDqyitbmkV1V3J4aXKvQxokqYJ5UT1Cx76go67LhOK6OHMQGs72v+nyUgdhbzkwLiYjSCZ2B0yBiL6KwFeVseZU6SYYoScjNWyXqElrHTLPR5WS0cmKUKNGxqqUlSYiSR6NRKaOiERneEqqsaif/Hx260lBwNNodnJ7cYD5M1Cd5HDj4upxRnKIdMAYCbdt9/BVH6x1cwVxpbvckGbo/3nMu/XhHNynxl85Siv2vaq6fZ7vldXo7HaXZbdRw84uSMHuCHDnxa9rkD/j6h8/UStkxaNvuPktXb1bLZfYu8neAfUiZTebOWi3dtFaHEkOPbgjq7nV/aZ7OcucFscLpUAPpHoVZItg8S8nhK5898HdeCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e7858616125063f0bc6/clusters/processes-244",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "888"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:15 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "63"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..e20586b95d
--- /dev/null
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKm1VmlUEaRDgd+YRUHQyTaWw1Lm5KkPkz874sVUae02WNuTu49yU1yQIym3xK5Xwe0ExAjF+2UyqSL8YbxPHqJYN9IeLrl0bqx4QkmGcVEMSLxvom3gueZxE4HnCZ0uu2uYzt2s205rdhabxydIpcKhMSZ4HsagcACtpSn8o2mei6CHs9T5SmRQ+2CSM9fhDVFQXhD26plZAujPPHsGlWQyAmIiY54tmWhOhLAtLAEFqPj8jSUOVPnzdBUKpJuIKQ/cI6QPaGMrBlMzw5FMIKY6DXIPTnUUUoS0Bnn4Srww9nKRsf6DRMTJh+hZgW0CB4z/a1WMKWJev6qF4xmU39QbhXMV6PxdNavpJ5pPYdKvS5QqwIylb9wpUVD36A//sQMCsfzWb+6k3dk6W7vyNcKsmiWkeeVrPK8kuaeRqdkSJX6DQOzu6A5k5rvJpS+V/+hSv0/Bmb++sFWP7G7FrSNyU7pwX3eCi6vcdsqhpeP9pR0ERYhxRVhxV+MXPv4C8FXlTwUBgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e7858616125063f0bc6/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "414"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:07 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "68"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_processes_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_processes_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_processes_1.json
rename to test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_processes_1.json
index 332bf07574..9689406e8c 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_processes_1.json
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_processes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWVQUvDMBTHv0sOntamja6ZhSFjehjoLJsXFZGsfW2DaVKSdEzGvrvZ1Ita3IZOhF7S9/7ll/d+0CUSXD4ZFN8vUakhRzEqra1NjHEqVJN5Gcz9SslCZTM/VRVmNcfMCmbwnOBCq6Y2OKJwQvKUnFI6I5RGOWW0F2UhrrVKwRgwZ1ymoslgqBpp+1Y3cFSzAsZN1Q+PuIXKJKAT96YfBgHqIA3CkRgQOVo9rI+mEfaVMtXALGSuTALS9YJjj0Q3YRR3ozikdy67gRqtG9q4XFOpjJWsAte1uY13Ui2eutIzJdOZFwTu8QstF+b98ptBSLAuy7OdUzGhQUhd1oVswmXxFX43WuMfZB94T/wPe6mVtui1uK7VgqdsCnbcPlj3Dftcw1vH5CK5HA0Hj9OL4fX4fDC5deXGgB4IztwMkFCF8UiPbLWWOWjDlXSxnh/4EVp1DidLuJcsLan/Ist3+H8vS/tadpWl94OykL1kaUn9F1m+w/8lWZLJ6GorVdqX8kkVh2eVZWLzM0Px8eoFWVbZvkUHAAA=",
+  "Body": "H4sIAAAAAAAAANWVXUvDMBSG/0suvLJNmq4fFoaM6cVAZ5neqIhk7ekaTJuSpGMy9t9N58eFUtSBUyE36TlveXLel2SNBK8fNEpu16hUUKAElcY0OsE4E7LNnRyWbiXrhcznbiYrzBqOmRFM4yXFCyXbRuMwgpBCFAdx6IUeDUjoF2SehbhRMgOtQR/zOhNtDmPZ1mZoVAsHDVvAtK2G3gE3UOkUVGq/DD1C0CFSICyJBlGgzV231a0wz5SZAmYgt2VKaOAQ36HxFQkSb5D4RzdWu4WadA19XLaplNrUrALbtT2No3xSrgpHl0zlDiF2uf4qKNTr4beDqMFYLc+/rUpoRLzIaq3IpLxefMTvVoe/Fz/wjvjvfGmkMui52NUawTN2CWbaP1j7D/PYwEvH7DQ9m4xH95en44vpyWh2bcutBjUSnNkZoDdehw4GX/JmCUpzWVtt7BI3RJvD/SXG2ykxPar/kpjP8H8oMelscv71vPQ785t5oTvlpUf1X/LyGf4fuWH6vfmQGEtppGFi+7ahxN88AUv3Y7pUBwAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/processes",
+  "Path": "/api/atlas/v2/groups/67e62e7858616125063f0bc6/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "416"
+      "414"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:03 GMT"
+      "Fri, 28 Mar 2025 05:15:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "40"
+      "63"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net_27017_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_processes_atlas-r30hxf-shard-00-00.3x5fr.mongodb-dev.net_27017_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net_27017_1.json
rename to test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_processes_atlas-r30hxf-shard-00-00.3x5fr.mongodb-dev.net_27017_1.json
index bbba4da650..01acae309c 100644
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net_27017_1.json
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e62e7858616125063f0bc6_processes_atlas-r30hxf-shard-00-00.3x5fr.mongodb-dev.net_27017_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAALVT3WrCMBR+l1zsyjY12tYVxhAnTNicqDfbGCM2xzYsTUqSCkV896WdyGQIbkPIRUK+33CyRakGaoGhBJGAhF7Q80i07EZJP0xI9II6KNOqKicNIIqhT1i4pmxFo7Dbo4O0OcQOlCtjJS3AoagV1Hh5XYsq9kxONfOCwC2fyRXP/ELJTLGVx2DjS7COy9mvWQmJg27j60h2xmX2M36UBGETX3D5YVDyukW5hrXD5daWJsE4FapireBe3E9VgWnJcZsFbwhuqxt8qjcutUrBGDD4j/E1CJfIgFijXecCCQ8WR5JHcq3CZdz/+T64AGoqDQVIa24zTWUlqOa2vpktw8erEjRXzO1J//6Mnt/F0O6tg0qlLfpyatil4CldgJ2enmLnYusS9oj5ePYwGQ3fF+PR0/RuOH9215UBPRScuoFDh/JedB2e9RE2oA1X0nEHfuBHaPcJRjDQMJ4DAAA=",
+  "Body": "H4sIAAAAAAAAALVTW2vCMBT+L3nYk23S9LrCGOKECZsT9WUbY8T2tA1rm5Kkooj/fakTmQzBbQjnIZDvGk42KJHANKQoRpRQ3yKuRaM58WPHi93rF9RDuRRtM+oAQQgBhTDyo8AJHOqTwM3IIgkMqBBK16wCg2K6ZMqSLilWmaUKJlOLEDO2u/IzaVeizkW6sFJY2jVow+Xpr1kxDYkTGq4h6Qmv85/xu+nil7z+UCh+3aBCQmZwhdaNijFOStGmO8G9uJ2ICrOG410WvKR4V13hU71xI0UCSoHCf4wvoTSJFJQZ2vYukPBgcSR5JLdTuIz7P98HV8BUK6GCWqvbXLK6LZnken0zmfuPVw1ILlJzpt79GT2/i6HtWw81Qmr05dSxm5InbAZ6fHqLjYteN7BHTIeTh9Gg/z4bDp7Gd/3ps7luFch+yZlZOHQob1HPO+sjLEEqLmrDjWxiB2j7CfX6rSyeAwAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/processes/atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net:27017",
+  "Path": "/api/atlas/v2/groups/67e62e7858616125063f0bc6/processes/atlas-r30hxf-shard-00-00.3x5fr.mongodb-dev.net:27017",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "359"
+      "360"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:13 GMT"
+      "Fri, 28 Mar 2025 05:15:16 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "114"
+      "98"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index f605b69e00..3e957b49d5 100644
--- a/test/e2e/.snapshots/TestProcesses/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:53 GMT"
+      "Fri, 28 Mar 2025 05:07:07 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_1.json
index 8356fd196e..aab56f4827 100644
--- a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGCCibx26t4urToc9kGsGhvZJh0i/r2gqLQsFYtH657ePcm6O5FmChH9k5tsJKLIiPQIERURhBWszosqZ/yl5KJqRF29kYzodcYbPDNVd6Ba4HVZwUWuj2aZG20/AxHvd3L12C3sNcYxCEqlcZPKFd5Og7O9U+1JuoHCqClEA4HeGO29m8ZA/7F7NIsyoOnInCVYQaWzEbRFH7ZtO/vO/AdOVPP4nkMtP2iaEgURWgj4Go7l7Pk0TSMea3lwiRq8kxgCHurY2DQtX1cd0egQD7T8svNHRiwMuOBbYI4M85IVi8j5/nk9+Ro7BfzCoOoYKoaNUlwqPJP5G4Q3MvdGBAAA",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBCG3+VmiB1TDGHt1L1dWnUw9kGsGBvZJh0i3r2OotKyVCxIt92n//+k091AmilE9M9ushEamoH0KCIqaIBRVua0yFn9SsuGVmneIQN93/EKOcOqLmt+5EdWUl50tJU87Y22lwDNxw3OHrvEnmMcQ0OING5SucLrYXC2d6o9SDcQMWoiohGBXBnpvZvGQP5J92hSZEDTwZztUEGks1Foiz4sbav0VfIfeCebx3k2ufyg+5goEUUrAr6FbTprfh+nEbe5PLidHLyTGAJu8ljYfVy+zjqi0SFucPll588MrBgw4Ytgjgzz04mmIOf7l/vLl9gpwWsmio6hSv1KcanwCeZvOpPeRkYEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "279"
+      "281"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:51 GMT"
+      "Fri, 28 Mar 2025 05:07:04 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1488"
+      "2852"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_1.json b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_1.json
deleted file mode 100644
index a216c9031b..0000000000
--- a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfCyGhkDVvKdCKiY+KpO3WaUJOcgGvjh3ZDhOt+O+7xrQFpk176fYQKfG95/jY956bZ0KLNRU5FD0pFmxZK2qYFCR6JnmtjSynFQiteY9VK1AuJ+XaD0j09dsZKZlgZV0OBM04FBi4UdLIXHISkXSU+POAnBHD9SF8LAvAcH9wFd+OUrI9IxnNH+tqT0KiBeUacJVhvoDcSGXlwElYAS1uFCxAAcpHQg25FAVVG0uZc1QPKt1UNjQb3IyGvTgZpCgnd6x4ysQoJpYa2S0CCQ308UFA0Ao6jVa7EXRTvxu1w6hz/oDQgunHhD3B9SWJ2q1my63cU4X38HKuq9vR6Mv8Pp6NB32EoDi1qexusZmBNnhBa1YAHolMppMBZiy5zCjvOcEJ8MWYCrqEIllRVSDv64mXStbVEG+AdEM4D4rOghYZ7Xb8Nv2Y248Q2dhbvBtchGEWhGF3EdKw459nGOc0A65d9TgTj/b1mazwIhG3MqbSkeflXNZFo4B1s5RiKYusmcvSoxXzqOFUe+vA24nR3u+UePsCaK9SMgetQTe6Fx1i68Z3xeILrNO/29lzTeYprIFU8Elm+lXM0eZHGx9m/w+1WtBKr6T5G61vuVvrTBvpX47pd6nukH9navKx2SKvsaPlZhcDgpa2hU9LVtFaHzivYubUqwoqzvLd6EgqyF1THbaif9yKbStD1OWuxzHbtxRLRLsR4fBoA74xLNd7SmQU2thhZT2I3GO/tTflcHqTWEu20JKQ6TvJ6xL25k/SeNKPZ9aMAi3ak7UwJGqh5WltZJJTvjMZDjxZVrW1/6/DplJQMJwZazg9uUY89OUPcRzYOl12UJyybTEGHCeQXXyPo7W3VjCTipkNiUL74WbOxJU3vk+Im59TwTfvdbmunvstb5P5IE7Sub/rzScpYPiH5rggLmcPfsDXDw6ppDQ9UGa/+zCZXc+m0/SzjwhUb14gvdkgToeTa/v3ATudd61pf05u8p9Wce2sMMO6UA3JBi1ZIs0oTcj2J0NRh9ojBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "792"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:53 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "545"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_1.json b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_1.json
new file mode 100644
index 0000000000..a0cec9e793
--- /dev/null
+++ b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e62e7858616125063f0bc6_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV72/aMBD9VyZ/LiSEQat8S4FWTPyoSNpunSbkOAd4dezIdphoxf++M6YdMK3al24SSInv3vOz797lmdBiTSWDoqfkgi9rTS1XksTPhNXGqnJagTRG9Hi1Au1zMmFaEYm/fjsjJZe8rMuBpLmAAgM3WlnFlCAxyUZpax6RM2KFOYSPVQEY7g+ukttRRrZnJKfssa72JCReUGEAVznmS2BWaScHTsIaaHGjYQEaUD4SGmBKFlRvHCUTqB50tqlcaDa4GQ17STrIUA7zrHjK1GoulwbZHQIJLfTxj4AojDqNsN2ILrKwE4fn+HtAaMHNY8qf4PqSxO2wGfqVe6rxHl7OdXU7Gn2Z3yez8aCPEBSnN5XbLbEzMBYvaM0LwCORyXQywIylUDkVPS84BbEYU0mXUKQrqgvkfT3xUqu6GuINkO45dCM4v+hcdFvdVtQJu+1FmLMusvGDeH4UZ902xgXNQRhfPcHlo3t8Jiu8SMStrK1MHARMqLpoFLBulkouVZE3mSoDWvGAWkFNsI6CnRgT/ElJsC+ACSqtGBgDphF9/Ehc3cSuWGKBdfp3Owe+yQKNNVAaPqncvIo52vxo48Ps/6HWSFqZlbJ/o/VX7tY500X6l2P6Xek75N+Zmlw0Q/IaO1puuuaRtHQtfFqyitbmwHkVt6de1VAJznajI62A+aZ6oxU7rhVlXe56HLNbjmKJaD8iPB5tIDaWM7OnREZprBtWzoPIPW6Fe1MOpzeps2SIloTc3ClRl7A3f5olk34yc2aUaNGeqqUlcYiWp7VVKaNiZzIceKqsamf/34dNpaHgODPWcHpyg3joqx/yOLD1utygOGXbYgwETiC3+B5Ha2+dYK40txsSn7sXP3MmvrzJfUr8/JxKsXmvy/X13G95m84HSZrNW7vefFIShm80R058zh78gI8fPFIrZXug7X73YTq7nk2n2ecWIlC9fYH0ZoMkG06u3dcH3HTetab7OPnJf1rFtbfCDOtCDaQbtGSJNKMsJdufOAz+uSMHAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e7858616125063f0bc6/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "779"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:07 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "536"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/memory.json b/test/e2e/.snapshots/TestProcesses/memory.json
index e28d693788..7c08a1ae6c 100644
--- a/test/e2e/.snapshots/TestProcesses/memory.json
+++ b/test/e2e/.snapshots/TestProcesses/memory.json
@@ -1 +1 @@
-{"processesGenerateClusterName":"processes-695"}
\ No newline at end of file
+{"processesGenerateClusterName":"processes-244"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_1.json
similarity index 84%
rename from test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
rename to test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_1.json
index 4215a09fc4..dbd6700ff3 100644
--- a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
+++ b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJlbmFibGVkIjpmYWxzZX0=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f6eadba6513a8c6291e/privateEndpoint/regionalMode",
+  "Path": "/api/atlas/v2/groups/67e6305e58616125063f2558/privateEndpoint/regionalMode",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:41 GMT"
+      "Fri, 28 Mar 2025 05:15:12 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "43"
+      "28"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_1.json
similarity index 83%
rename from test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
rename to test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_1.json
index 51442e61cb..bb955fc13c 100644
--- a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
+++ b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJlbmFibGVkIjp0cnVlfQ==",
   "Status": 202,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42f6eadba6513a8c6291e/privateEndpoint/regionalMode",
+  "Path": "/api/atlas/v2/groups/67e6305e58616125063f2558/privateEndpoint/regionalMode",
   "Headers": {
     "Content-Length": [
       "16"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:40 GMT"
+      "Fri, 28 Mar 2025 05:15:12 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "66"
+      "52"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_2.json b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_2.json
similarity index 83%
rename from test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_2.json
rename to test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_2.json
index e7f18fa8fa..8bce1f0919 100644
--- a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_2.json
+++ b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e6305e58616125063f2558_privateEndpoint_regionalMode_2.json
@@ -2,7 +2,7 @@
   "Body": "eyJlbmFibGVkIjpmYWxzZX0=",
   "Status": 202,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42f6eadba6513a8c6291e/privateEndpoint/regionalMode",
+  "Path": "/api/atlas/v2/groups/67e6305e58616125063f2558/privateEndpoint/regionalMode",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:41 GMT"
+      "Fri, 28 Mar 2025 05:15:12 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "74"
+      "47"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/POST__api_atlas_v2_groups_1.json
index 9c0c0a210f..32f9d29b49 100644
--- a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUPWvDMBCG/4tmO3KUWHG9lg7dCm2Xlg4X6eyIKpLRnVNoyH+vQuhHluLFcNs9vO8DB3cUxo/EmG7jGFi0VSFMQmC0ohWqUnVZrUqln5a6XeepXkQh3HmnN7hWnUawW9D1cgWN0epmiXnvXXgn0b4exS5hl9kd80CtlMbH0ZYWD4t9DH2024WJewmDk8AeSB6U7FMcB5L/pCf0OZLQd+JUzFAhTQwMLmCin7ar9KvkP/BMNpfzTHL5RucxscCwBcJnmqZzzc/jNOA0lws3k0OKBolwkscPO4/Lx84xekc8weWXPb0VIsAeM56wdzGAd59oH5I75E9wF+wQXWB6RGYXeipRYdnUTe6Iqb8/f4MaOwu6UbDqFFqFG2u1sbgWpy+5ci0TYQQAAA==",
+  "Body": "H4sIAAAAAAAAALWUsWrDMBCG30WzHTlKpLheQ4duhbZLSwdFOtuiimR05xQa8u5VCE2bpXgx3HYf///BwR2Z8SMSpG0cA7GmKphJoAksa5iohCyrVSnq50o2yzzilRXMnXdqA2pVSZC1WqqlkJVatULKOu+9Cx/Imrcj6xO0me2JBmw4Nz6OtrRwWOxj6KLdLUzccz04rslr5AfBuxTHAfk/6Ql8jkTwLTsVM1RwEwNpFyDhte0m/Sb5DzyTzeU8k1x+0HlMrCa90wgvOE3nlp/HaYBpLhduJocUDSDCJI8rO4/LZ+8IvEOa4PLLnt4LFvQeMp6gczFo777APiZ3yJ/gPtghukD4BEQudFiCgPJuvckdMXUP528gobVa1UJnD7ACNtYqY2HNTt+hbGTeYQQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:38 GMT"
+      "Fri, 28 Mar 2025 05:15:10 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2062"
+      "1426"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json b/test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
rename to test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
index 1bbfa7228e..53c9d87881 100644
--- a/test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
+++ b/test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/snapshots/67e632777062fc48ea34f6ee",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:05:05 GMT"
+      "Fri, 28 Mar 2025 05:34:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "105"
+      "118"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_1.json
deleted file mode 100644
index 3f84fca1ab..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoWlSaFjeQhtQp36gJsDGNCEnuW09HDuynU4F9b/vug6sZR/aC9tDpdT33uNj33uOnwgt11QUUA6kWLBlo6hhUpDoiRSNNrKa1SC05gNWr0C5nIxrPyDR5y9HpGKCVU2VCJpzKDFwpaSRheQkItk49e8DckQM1/vlE1kChofJRXw9zsj2iOS0eGjqFoRERjWAiwzTBRRGKssGnqMLyjWGFdDySsECFCB7xNNQSFFStbGIBUfyoLJNbUPz5Go8GsRpkiGbwqHiIVOjmFhqRLcVCGhgiD8sCLrB6XG3dxz0M78f9cLoJLzD0pLph5Q9wuU5iXrdTtet3FKF1/B8rIvr8fjT/W08nyRDLEFyalPb3WIzB23wftasBDwSmc6mCWYsucwpHzjCKfDFhAq6hDJdUVUi7suJl0o29QhvgPRDOAnK05CWOe2f+j16VpwuwmCBaGwvnr8PwzwIw/4ipOEJnOQY5zQHrl3zOBMP9vOJrPAisW5lTK0jzyu4bMrjEtadSoqlLPNOISuP1syjhlPtrQNvR0Z7v2PitQ3QnuutPbpUoI8D306EAr7rGF9gs/7x9u2Sp9zaB5nrF0YHDA5238/+b5S1oLVeSfM3hH/kbq1ObWR4PqFfpbrBTXYSJ2edLnmJHSx3+hgQtLIT/csO1rTRe2qsmXklXwU1Z8XOTNIaCjdn+9NJD6ezZ1FFU+3GHrN9C7HEamcarh6VwTeGFbqFREShjbUvK0vEnvjdVqej2VVqVdpFlUKubyRvKmj9IM3i6TCeW30KVO1ANsKQqIsuQBsj04Lyne7QAmVVN9YRfvafWkHJ0EbWkLyKaKyHofwmDgNbx8t6x2u0LcaAoynZxbc4Wm9rCTOpmNmQKLR/nA1NXYvj25Q4S50Jvnmry3X9bLe8Tu+TOM3u/d18PkoBoz8Mh7U2m9MW3+HnO1eppDQDUKbdfZTOL+ezWfbRxwpkb55LBvMkzkbTS/se0WXrgKg3tO7dkNqHyz0Lr/u5dsKYY4eohnSDKq0QcJylZPsdx3ahBj8HAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "800"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:47 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "87"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_2.json
deleted file mode 100644
index 449dd826d2..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfF1g/HVisgGFzbLTzYcWApTddhCCjpbHOhSIGkVLiB//cdRbm10ywYBnQDbEPm8R6f7t49PhJaNFTkUEyk2LBtrahhUpD4keS1NrJcVSC05hNW7UC5PSnXQUji3/+4ICUTrKzLmaAZhwIDN0oamUtOYpIukuA+JBfEcH2avpQFYHg6eze+XaTkcEEymj/UVQdCYqNqwEWG2wXkRirLBo7RDeUawwpocaNgAwqQPeJpyKUoqNpbxJwjeVDpvrKh9exmMZ+Mk1mKbHKHii+ZGMXEVlt0bajNRXhSSrGVRRZ7nqOlAMuAP70wCHt6h5t6vo+fvmJ1Wfe77b0Cmr4AE4eRH0QXL6YG/z41fCnV+wUbdWWr94rWZpfIWuVwRQts0isFFWc5TcBcUcOp7vHh513z5giNdTmWIFHNtyr8rFXzbCWe59GWHjtjYIpfhAn9cNjzB71wlAajeBDFl9EnPKtg+iFhX+D9WxIP/L7vVu6oQqpHfby7XSx+u78br5ezKaZgl9W+sm0bmzUSQaE1rADUBrleXc9wx5bLjPKJ63wCfLOkgm6hSOwrIu5X6WyVrKu57fUogsuwGEa0yOhoGAzo63y4icINorGTePYmirIwikabiEaXcJlhnNMMuHZTwJl4sI+PZIeKxLydMZXGuuVc1kVbnK5Q/VyWHq2Y1zbBa0KvJaO9v2PidUrWXQ/WJz0gdgp4K32+wdL/x8d3S14ni19lpr8yOmNwdvrp7v+Nsha00jtp/gnhb3sP1vBsZPp2Sf+U6gMe0noled23E9TFzpb7IwwIWlpFP9vBitb6xNYqZp74YDe5rWFVkDudnaqTnqtzYFFFXbayx92BhdhitnNfl4+TwfeG5bqDRERhDSAHO5aIvQz8bk7nq5vETqmPUwqZ/iB5XUJnrEk6vp6O13Y+BU7tRNbCkNhHF0ADkklOeTt3eJfIsqqtI3xv5GgrBUM/bmD2JKIxH6byszgPHBwv6x1P0Q4YA47ubhd/xKsNDpYwk4qZPYkj+8fZ0LVr8fguIe5uWgm+/1HFdf3sjrxN7mfjJL0PWn1+kQLmL4jDWpvd0yV/wsefXKaS0kxAme70ebJ+v16t0o+BuxvMMWU+XVi3NXTbuR/OGtp2K1B7+7u79WkvGzcUa+wO1ZDscUJLBFukCTn8BV+eLDaECAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "906"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:20 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_3.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_3.json
deleted file mode 100644
index 301858c020..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfF1g/HVisgGFzbLTzYcWApTddhCCjpbHOhSIGkVLiB//cdRbm10ywYBnQDbEPm8R6f7t49PhJaNFTkUEyk2LBtrahhUpD4keS1NrJcVSC05hNW7UC5PSnXQUji3/+4ICUTrKzLmaAZhwIDN0oamUtOYpIukuA+JBfEcH2avpQFYHg6eze+XaTkcEEymj/UVQdCYqNqwEWG2wXkRirLBo7RDeUawwpocaNgAwqQPeJpyKUoqNpbxJwjeVDpvrKh9exmMZ+Mk1mKbHKHii+ZGMXEVlt0bajNRXhSSrGVRRZ7nqOlAMuAP70wCHt6h5t6vo+fvmJ1Wfe77b0Cmr4AE4eRH0QXL6YG/z41fCnV+wUbdWWr94rWZpfIWuVwRQts0isFFWc5TcBcUcOp7vHh513z5giNdTmWIFHNtyr8rFXzbCWe59GWHjtjYIpfhAn9cNjzB71wlAajeBDFl9EnPKtg+iFhX+D9WxIP/L7vVu6oQqpHfby7XSx+u78br5ezKaZgl9W+sm0bmzUSQaE1rADUBrleXc9wx5bLjPKJ63wCfLOkgm6hSOwrIu5X6WyVrKu57fUogsuwGEa0yOhoGAzo63y4icINorGTePYmirIwikabiEaXcJlhnNMMuHZTwJl4sI+PZIeKxLydMZXGuuVc1kVbnK5Q/VyWHq2Y1zbBa0KvJaO9v2PidUrWXQ/WJz0gdgp4K32+wdL/x8d3S14ni19lpr8yOmNwdvrp7v+Nsha00jtp/gnhb3sP1vBsZPp2Sf+U6gMe0noled23E9TFzpb7IwwIWlpFP9vBitb6xNYqZp74YDe5rWFVkDudnaqTnqtzYFFFXbayx92BhdhitnNfl4+TwfeG5bqDRERhDSAHO5aIvQz8bk7nq5vETqmPUwqZ/iB5XUJnrEk6vp6O13Y+BU7tRNbCkNhHF0ADkklOeTt3eJfIsqqtI3xv5GgrBUM/bmD2JKIxH6byszgPHBwv6x1P0Q4YA47ubhd/xKsNDpYwk4qZPYkj+8fZ0LVr8fguIe5uWgm+/1HFdf3sjrxN7mfjJL0PWn1+kQLmL4jDWpvd0yV/wsefXKaS0kxAme70ebJ+v16t0o+BuxvMMWU+XVi3NXTbuR/OGtp2K1B7+7u79WkvGzcUa+wO1ZDscUJLBFukCTn8BV+eLDaECAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "906"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:57:24 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "81"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_4.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_4.json
deleted file mode 100644
index d155ef7b7d..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_4.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfF1g/HVisgGFzbLTzYcWApTddhCCjpbHOhSIGkVLiB//cdRbm10ywYBnQDbEPm8R6f7t49PhJaNFTkUEyk2LBtrahhUpD4keS1NrJcVSC05hNW7UC5PSnXQUji3/+4ICUTrKzLmaAZhwIDN0oamUtOYpIukuA+JBfEcH2avpQFYHg6eze+XaTkcEEymj/UVQdCYqNqwEWG2wXkRirLBo7RDeUawwpocaNgAwqQPeJpyKUoqNpbxJwjeVDpvrKh9exmMZ+Mk1mKbHKHii+ZGMXEVlt0bajNRXhSSrGVRRZ7nqOlAMuAP70wCHt6h5t6vo+fvmJ1Wfe77b0Cmr4AE4eRH0QXL6YG/z41fCnV+wUbdWWr94rWZpfIWuVwRQts0isFFWc5TcBcUcOp7vHh513z5giNdTmWIFHNtyr8rFXzbCWe59GWHjtjYIpfhAn9cNjzB71wlAajeBDFl9EnPKtg+iFhX+D9WxIP/L7vVu6oQqpHfby7XSx+u78br5ezKaZgl9W+sm0bmzUSQaE1rADUBrleXc9wx5bLjPKJ63wCfLOkgm6hSOwrIu5X6WyVrKu57fUogsuwGEa0yOhoGAzo63y4icINorGTePYmirIwikabiEaXcJlhnNMMuHZTwJl4sI+PZIeKxLydMZXGuuVc1kVbnK5Q/VyWHq2Y1zbBa0KvJaO9v2PidUrWXQ/WJz0gdgp4K32+wdL/x8d3S14ni19lpr8yOmNwdvrp7v+Nsha00jtp/gnhb3sP1vBsZPp2Sf+U6gMe0noled23E9TFzpb7IwwIWlpFP9vBitb6xNYqZp74YDe5rWFVkDudnaqTnqtzYFFFXbayx92BhdhitnNfl4+TwfeG5bqDRERhDSAHO5aIvQz8bk7nq5vETqmPUwqZ/iB5XUJnrEk6vp6O13Y+BU7tRNbCkNhHF0ADkklOeTt3eJfIsqqtI3xv5GgrBUM/bmD2JKIxH6byszgPHBwv6x1P0Q4YA47ubhd/xKsNDpYwk4qZPYkj+8fZ0LVr8fguIe5uWgm+/1HFdf3sjrxN7mfjJL0PWn1+kQLmL4jDWpvd0yV/wsefXKaS0kxAme70ebJ+v16t0o+BuxvMMWU+XVi3NXTbuR/OGtp2K1B7+7u79WkvGzcUa+wO1ZDscUJLBFukCTn8BV+eLDaECAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "906"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 17:01:09 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "91"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_4.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_4.json
deleted file mode 100644
index 6653a92e10..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_4.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1SQW6DMBD8i8+AwQk44Zaql16qKolaqVUPBi/ECmDXNlFplL93E5JUkdprj8zOzswy3pOy0b18snqnJFiSk8XLigSk1GZYQq1050j+9h4QCa60ynhEkOTB+dB1wriN9kiHT6MsuIXHGYtZGsaTkPF1kuXpNI/jV6RUFj566MphPRhAmu4ktKKTOFISvzMO00nCZnPOC8Z5VnHB55kAnDeq2x5j7MnGQoXcjffG5ZSesocSdlGru1rLIip1S4VRVPhGOLpjtLa6N44e1ZlMuZCFyNJkImZlWnFWoUTvPFhHC1Fue7PEwzReErKEnSF6uXNU+SOjhQaDOWgqcgj+OejV/sbuxuq8TQ5Y5Yg/o9ZY5iyKoww1jG5UOTx4aM+dWzCIiBX4R9EeO/vV+vJ7rr3eX3p1XvgetYjq8IHVuOJOqLaihpX6grsBHxLJ44D4cfnHkRy+ATj/gR+bAgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "360"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:56:09 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "67"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_5.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_5.json
deleted file mode 100644
index 3d9292340c..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_5.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL2SPW/CMBCG/4tnghOH2CEbVZcuVQWolVp1MPEFLJLYtR3UFPHfexCgQmrXjr6P573ze3tS1qZTT87stAJHCjJ7WZARKY3t57DWpvWkeHvHgAMZQM0ClrCYZVGcRowvE15kvIinr9ijwJdO24BNWBTAh8i30vqNCZiFT6sd+FuAOAFEwdgRUDn46KAt+2VvActMq6CRrcKUVvjmAiZpwvKpECsmBK+EFFMuAfO1brfHSfdk46DC2k0I1heUntaLFOzGjWnXRq3GpWmotJrKUEtPd4yunemsp0c6U5mQaiV5lqQyL7NKsAoRnQ/gPF3JctvZOS5mcJOIJewcopc9B8ofMzqocTAPdUUOo38e9Cp/I3cjde4mB3R7iD8jazAzH8djjgxral32DwGa81k4sBiRCwiPsjl69qv05Xuuvt5ffPVBhg5ZeHCNrQEv7BQ0Tq5hob/grsc7IsUkSXku8jiPRyQMkB9lcvgGxWT998YCAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "380"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:57:23 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "73"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_1.json
deleted file mode 100644
index 2f55507cd8..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoWlSaCBvoQ2oUz9QE2BjmpCT3LYejh3ZTqeC+t93XQdW2Ib2wvZQKb2fx773HD8SWq6pKKAcSLFgy0ZRw6Qg0SMpGm1kNatBaM0HrF6BcjEZ135Aoi9fD0jFBKuaKhE051Ci41JJIwvJSUSycerfBeSAGK730yeyBHQPk/P4apyR7QHJaXHf1G0REhnVABoZhgsojFQWDTx5F5RrdCug5aWCBShA9FhPQyFFSdXGViw4ggeVbWrrmieX49EgTpMM0RSuKh4yNYqJpcbqNgMLGhjiDxOCbnB82O0dBv3M70dHx1HQu8XUkun7lD3AxRmJet1O11luqMJreDrW+dV4/PnuJp5PkiGmIDi1qW232MxBG7yfNSsBj0Sms2mCEUsuc8oHDnAKfDGhgi6hTFdUlVj3+cRLJZt6hDdA+iEcBYvAp2VO+8d+j54U/eAITrEa2/P3TsMwD8KwvwhpiKYQ/ZzmwLUbHmfi3n4+khVeJOatjKl15HkFl015WMK6U0mxlGXeKWTl0Zp51HCqvXXg7cBo709IvHYA2nOztUeXCnRwGPaIHR7fTYwvcFj/uH1r8pSzfZS5fkb0AsGL7vvR/w2yFrTWK2n+BvDP2K3lqfUMzyb0m1TX2GRHcXLS6ZJn3wtzp48OQSu70b+dYE0bvcfGmplX9FVQc1bsxCStoXB79sZ29o5tx6barT1G+7bEErOdaLh8ZAbfGFbotiRWFNpY+bK0xNoTv9vydDS7TC1Lu8hSyPW15E0FrR6kWTwdxnPLT4GsHchGGBJ1UQVoY2RaUL7jHUqgrOrGKsKv+lMrKBnKyBqSVx6N+TCU38VLx9bhstrxutoWfcBRlKzxPY7W21rATCpmNiQK7R8nQ1M34vgmJU5SZ4Jv3uty3TzbllfpXRKn2Z2/288HKWD0xnIsiItpk2/x84PLVFKaASjTdh+l84v5bJZ98jED0ZunlME8ibPR9MK+R3TZKiDyDaV7t6T24XLPwut5rh0x5jghqiHdIEsrLDjOUrL9AQqDIfE/BwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f21adba6513a8c624e9/clusters/backupRestores2-73",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "795"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:24 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "94"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_2.json
deleted file mode 100644
index 54edb94544..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVbW/bNhD+KwM/9Mti68Wx1QgIBtd2Cw92HFhKs7UYAko62VwoUiMpD27g/76jKLdOlgZFgW6Abci8u+ce3cvDB0KLHRU5FBMpSrZpFDVMChI/kLzRRlarGoTWfMLqLSjnk3IdhCT++McZqZhgVVPNBM04FGi4VtLIXHISk3SRBHchOSOG69PwpSwAzdPZ2/HNIiWHM5LR/L6pOxASG9UAHjJ0F5AbqSwbOFpLyjWaFdDiWkEJCpA94mnIpSio2lvEnCN5UOm+tqb17Hoxn4yTWYpscoeKL5kYxcRGW3RtqI1FeFJJsZFFFnueo6UAy4A/YS8a9PQWnXq+j5++zsrzi37n3itg1xdg4jDyg+jsxdDg+0PDl0K9X7BRl7Z6r2hjtolsVA6XtMAmvVJQc5bTBMwlNZzqXuCr0fCvIzTW5ViCRO2+VOFnrXbPVuJ5Hm3psTMGpvhFmNAPhz1/0AtHaTCKz4dxOPiAuQqm7xP2Cd69IfHA7/vu5JYqpHqcj7c3i8Xvd7fj9XI2xRDsstrXtm1js0YiOGg7VgDOBrlaXc3QY8NlRvnEdT4BXi6poBsoEvuKiPt5dDZKNvXc9noUwXlYhgEtMjoaBgP6Oh+F53CBaOzEPriIoiyMolEZ0QiPIrRzmgHXbgs4E/f28YFscSIxbmtMrbFuOZdN0RanK1Q/l5VHa+a1TfB2odeS0d7XmHjdJOuuB+uTHhC7BbwdfV5i6f/j9N2R143FrzLTnxk9YvAo+6n3/0ZZC1rrrTTfQviL78EKnrVM3yzpn1K9xyStVpLXfbtBne3RcX+EBkErO9HPdrCmjT6RtZqZJzrYbW4rWDXkbs5emM7B0GZsqnbs0TuwEBuMdurr4nEz+N6wXHeQiCisAORg1xKxl4Hf7el8dZ3YLfVxSyHT7yVvKuiENUnHV9Px2u6nwK2dyEYYEvuoAihAMskpb/cO7xJZ1Y1VhH8LOcpKwVCPdzB7YtEYD1P5t3hsODheVjueoh3QBhzV3R7+iFcbHCxhJhUzexJH9o+ToSvX4vFtQtzdtBJ8/6OK6/rZpbxJ7mbjJL0L2vn8JAXMXxiOkjifLvgDPv7kIpWUZgLKdNnnyfrderVKfwvc3WCOIfPpwqqtoZtO/XDXULbbAbW3v7tbn/Zy55Zijd2hGpI9bmiFYIs0IYd/AKS/P1OECAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f21adba6513a8c624e9/clusters/backupRestores2-73",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "903"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:53:59 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "74"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_provider_regions_1.json
deleted file mode 100644
index 35348c8623..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLG1ttWKKNIhwNv2IqDIRLtqYalTUlSHzb874sVUae02WNOvpzzJSfJD2I0/ZLI+fxBOwExctBOqUw6GG8Yz6OnCPaNhKdbHq0bG55gklFMFCMS7228FTzPJO72oG3HtkWiNel2rBZ53nTtNrzoFLlUICTOBN/TCAQWsKU8la801XMR9HmeKleJHGpnRLreIqgpCsIdWc1aRrYwzhPXqlEFiZyCmOqIazWbqI4EMC0sgcXosDwOZc7UaTM0lYqkGwjoN5wiZE8oI2sGs5NDEYwgJnoNco4OdZSSBHTGebDyvSBcWehQv2JiwuQ9ZFdAC/8+099qBVOaqO+t+v44nHnDcit/vhpPZuGgknqk9Rgq9TpDrQrIVP7MlRYNPIP+eFMzKJjMw0F1J2/I0t3ekO0KsmiWkeeFrPK8kOaeRqdkSJX6jXyzu6A5k5pvJpS+V/+hSv3fh2b++sFWP7GbFnSMyV7pwX1cCy4vcatZDM8f7THpIihCiivCir8YOdbhF3RXlUwUBgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f21adba6513a8c624e9/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "414"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:23 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "82"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_1.json
new file mode 100644
index 0000000000..7149faac71
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVyW7bMBD9lYLnxFocL9VNtZXAhZfAUpIuKAJaGtlsKFIgKRdO4H/v0FRSO22BXtoeDMgczptHzrzHJ0KLLRU5FCMpSrZuFDVMChI9kbzRRlaLGoTWfMTqDSi3J+M6CEn0+csZqZhgVVMlgq44FBi4VtLIXHISkWyaBvchOSOG6+P0mSwAw+PkMr6ZZmR/RlY0f2jqFoRERjWAiwy3C8iNVJYNPEdLyjWGFdDiWkEJCpA94mnIpSio2lnEnCN5UNmutqFlcj2djOI0yZBN7lDxkKlRTKw1otsMBDQwxh8mhH7YO/e75+Ew83uRP4jCwSdMLZh+SNkjXL0jUdfv+G7ljiq8hudjXd5Mpx/v7+LlLBljCpJTu9pWi80StMH72bIC8EhkvpgnuGPN5YrykSOcAi9nVNA1FOmGqgJxX068VrKpJ3gDpD+AfgjD1cDvh2V+MQTavSjCEBCNHcXL3rAf9IOw5/e7ZeCXthecroBr1zzOxIP9fCIbvEjM2xhT68jzci6b4ryAbaeSYi2LVSeXlUdr5lHDqfa2oXcgo73fMfHaBmjP9dYeXSrQ573uW2Kbxw8d4yU26x+Xb5c85dbey5V+YXTC4KT68e7/RlkLWuuNNH9C+MfevdWpjYzfzehXqW6xyEHiZNjxyUvsZLnTx4CglZ3oX3awpo0+UmPNzCv5Kqg5yw9mktaQuzk7nk44nc6itBWb6jD2uDuwEGvMdqbh8lEZfGdYrltIRBTaWPuyskTsWeC3Op0srlOrUh9VCit9K3lTQesHaRbPx/HS6lOgakeyEYZEProAbYxMc8oPukMLlFXdWEf42X9qBQVDG9lC8iqiMR/G8ps4DewdL+sdr9H2GAOOpmQX/8bRuntLmEnFzI5EA/vH2dDctTi+S4mz1IXgu791ua6fbcmb9D6J0+w+OMznoxQw+f1wwIC4PW3yJ/x84zKVlGYEyrTVJ+nyarlYZB8CzED25jlltEzibDK/su8RXbcOiHpD6z4MqX243LPwup9bJ4wldohqSHeo0goBp1lK9t8B2DJ9Aj8HAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "800"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:27 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "67"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_2.json
new file mode 100644
index 0000000000..d99d07ed28
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVa48aNxT9K5U/5EsX5kF4dKRVRYBEVLCs8Gy2TVWtzMwdcNdjj2wPEVnx33s9HhLYbqKqUloJ0OD7OnPvucdPhOV7JjPIJ0oWfFtrZrmSJHkiWW2sKlcVSGPEhFc70N4nFSaKSfL7H1ek5JKXdTmTbCMgR8OtVlZlSpCEpAsaPcTkilhhzsOXKgc0T2dvx3eLlByvyIZlj3XVJiGJ1TXgIUd3CZlV2qGBk7VgwqBZA8tvNRSgAdFjPgOZkjnTB5cxEwgedHqonGk9u13MJ2M6SxFN5rPiS1Krudwal91Y5mIxPSmV3Kp8kwSBh6UB24A/nX7vp47ZoVMnDPHT3ZuozruteyeHfVeCTeJhGA2vvhka/fvQ+Fuhwc84qGvXvVestjuqap3BNctxSK80VIJnjIK9ZlYw06n6vAJ2So19ObWA6v2XLvxo9P7FTryMo2k9TsbCFL+YJg7jfifsdeJRGvaTcIhAP2CtnJtHyj/Buzck6YXd0J/cM41QT/x4e7dY/PZwP14vZ1MMwSnrQ+XGNrZrBIJE2/MckBvkZnUzQ4+tUBsmJn7yFESxZJJtIafuFTHvZ+pstaqruZv1YAiDGEabYTiIi+z1CFjvdR7HgNn4mb3ojwbRIIr74aBXRGHhSC3YBoTxWyC4fHSPT2SHjMS4nbWVwb5lQtV505y2Ud1MlQGreNAMIdjHQQPGBF9DErRMNu0M1mczIG4LREN9UWDr/+Py7VHQ0uIXtTGfEV0guKh+7v2/QTaSVWan7D8B/MX36ATPWaZvluxPpd9jkUYryajrNqi1XRx3B2iQrHSMfnGCFavNmaxV3D7TwXZzG8GqIPM8O2cnXLIzL1zFumxoj96RS7HFaK++Ph43Qxwsz0ybEjNKJwAZuLXE3MsobPd0vrqlbktD3FLYmPdK1CW0wkrT8c10vHb7KXFrJ6qWliQhqgAKkKIZE83e4V2iyqp2ivB3IUdZyTnq8R5mzywG42GqPspLw9HjctrxPNsRbSBQ3d3h93i13tEB5kpzeyDJ0P3xMnTjRzy+p8TfTSspDt+ruX6ebck7+jAb0/Qhavj5SUmYf50cMCTepw3+gI8/+EitlJ2Atm31OV2/W69W6a+RvxvsKWQ+XTi1tWzbqh/uGsp2Q1B3+/u79fks934p1jgdZoAecENLTLZIKTn+BfoiCx2ECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "903"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:34 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "69"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_3.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_3.json
new file mode 100644
index 0000000000..14bf1868a9
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVa48aNxT9K5U/5EsX5kF4dKRVRYBEVLCs8Gy2TVWtzMwdcNdjj2wPEVnx33s9HhLYbqKqUloJ0OD7OnPvucdPhOV7JjPIJ0oWfFtrZrmSJHkiWW2sKlcVSGPEhFc70N4nFSaKSfL7H1ek5JKXdTmTbCMgR8OtVlZlSpCEpAsaPcTkilhhzsOXKgc0T2dvx3eLlByvyIZlj3XVJiGJ1TXgIUd3CZlV2qGBk7VgwqBZA8tvNRSgAdFjPgOZkjnTB5cxEwgedHqonGk9u13MJ2M6SxFN5rPiS1Krudwal91Y5mIxPSmV3Kp8kwSBh6UB24A/nX7vp47ZoVMnDPHT3ZuozruteyeHfVeCTeJhGA2vvhka/fvQ+Fuhwc84qGvXvVestjuqap3BNctxSK80VIJnjIK9ZlYw06n6vAJ2So19ObWA6v2XLvxo9P7FTryMo2k9TsbCFL+YJg7jfifsdeJRGvaTcIhAP2CtnJtHyj/Buzck6YXd0J/cM41QT/x4e7dY/PZwP14vZ1MMwSnrQ+XGNrZrBIJE2/MckBvkZnUzQ4+tUBsmJn7yFESxZJJtIafuFTHvZ+pstaqruZv1YAiDGEabYTiIi+z1CFjvdR7HgNn4mb3ojwbRIIr74aBXRGHhSC3YBoTxWyC4fHSPT2SHjMS4nbWVwb5lQtV505y2Ud1MlQGreNAMIdjHQQPGBF9DErRMNu0M1mczIG4LREN9UWDr/+Py7VHQ0uIXtTGfEV0guKh+7v2/QTaSVWan7D8B/MX36ATPWaZvluxPpd9jkUYryajrNqi1XRx3B2iQrHSMfnGCFavNmaxV3D7TwXZzG8GqIPM8O2cnXLIzL1zFumxoj96RS7HFaK++Ph43Qxwsz0ybEjNKJwAZuLXE3MsobPd0vrqlbktD3FLYmPdK1CW0wkrT8c10vHb7KXFrJ6qWliQhqgAKkKIZE83e4V2iyqp2ivB3IUdZyTnq8R5mzywG42GqPspLw9HjctrxPNsRbSBQ3d3h93i13tEB5kpzeyDJ0P3xMnTjRzy+p8TfTSspDt+ruX6ebck7+jAb0/Qhavj5SUmYf50cMCTepw3+gI8/+EitlJ2Atm31OV2/W69W6a+RvxvsKWQ+XTi1tWzbqh/uGsp2Q1B3+/u79fks934p1jgdZoAecENLTLZIKTn+BfoiCx2ECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "903"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:27:54 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "71"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_4.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_4.json
new file mode 100644
index 0000000000..ada1ec343e
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_4.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVa48aNxT9K5U/5EsX5kF4dKRVRYBEVLCs8Gy2TVWtzMwdcNdjj2wPEVnx33s9HhLYbqKqUloJ0OD7OnPvucdPhOV7JjPIJ0oWfFtrZrmSJHkiWW2sKlcVSGPEhFc70N4nFSaKSfL7H1ek5JKXdTmTbCMgR8OtVlZlSpCEpAsaPcTkilhhzsOXKgc0T2dvx3eLlByvyIZlj3XVJiGJ1TXgIUd3CZlV2qGBk7VgwqBZA8tvNRSgAdFjPgOZkjnTB5cxEwgedHqonGk9u13MJ2M6SxFN5rPiS1Krudwal91Y5mIxPSmV3Kp8kwSBh6UB24A/nX7vp47ZoVMnDPHT3ZuozruteyeHfVeCTeJhGA2vvhka/fvQ+Fuhwc84qGvXvVestjuqap3BNctxSK80VIJnjIK9ZlYw06n6vAJ2So19ObWA6v2XLvxo9P7FTryMo2k9TsbCFL+YJg7jfifsdeJRGvaTcIhAP2CtnJtHyj/Buzck6YXd0J/cM41QT/x4e7dY/PZwP14vZ1MMwSnrQ+XGNrZrBIJE2/MckBvkZnUzQ4+tUBsmJn7yFESxZJJtIafuFTHvZ+pstaqruZv1YAiDGEabYTiIi+z1CFjvdR7HgNn4mb3ojwbRIIr74aBXRGHhSC3YBoTxWyC4fHSPT2SHjMS4nbWVwb5lQtV505y2Ud1MlQGreNAMIdjHQQPGBF9DErRMNu0M1mczIG4LREN9UWDr/+Py7VHQ0uIXtTGfEV0guKh+7v2/QTaSVWan7D8B/MX36ATPWaZvluxPpd9jkUYryajrNqi1XRx3B2iQrHSMfnGCFavNmaxV3D7TwXZzG8GqIPM8O2cnXLIzL1zFumxoj96RS7HFaK++Ph43Qxwsz0ybEjNKJwAZuLXE3MsobPd0vrqlbktD3FLYmPdK1CW0wkrT8c10vHb7KXFrJ6qWliQhqgAKkKIZE83e4V2iyqp2ivB3IUdZyTnq8R5mzywG42GqPspLw9HjctrxPNsRbSBQ3d3h93i13tEB5kpzeyDJ0P3xMnTjRzy+p8TfTSspDt+ruX6ebck7+jAb0/Qhavj5SUmYf50cMCTepw3+gI8/+EitlJ2Atm31OV2/W69W6a+RvxvsKWQ+XTi1tWzbqh/uGsp2Q1B3+/u79fks934p1jgdZoAecENLTLZIKTn+BfoiCx2ECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "903"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:31:48 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "69"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_1.json
similarity index 50%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_1.json
index ba93311e10..7209851126 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAM2Uz2vbMBTH/xcderJrS4mtRhDG6GB0h1JGdmnp4dl6TkRly5PksBDyv092EjeGMXrZ2pv8fn7ek7/aE62aF0fE055sLFZEkI33rRNJUmrTyVji9ro2zdrI4ro0dQKtSsBrcMmWJWtrutYlOcc5kxkHWUCe0RnclFnFWRVKdM6jdUkB5UvXfkfnjUUXM8pOpsQebd9M4T6pJiRIvDVd45fednjVwhrvu3pJr5TH2j2gfQiWJU1TEhGLOuA61BU5PPefrtP+OEoJTYlaoySiAu0wIhK12qLdrXYthizovKnBh4BX1w8b6j099wanLMqVqgMc1C0RexLYLNbYeCKaTuuI+OA9n2WodDwfIoK/2j577FyBugSpVKPcBuXnUImwlGVxOotZvqJcpFSk+WMgUiGc9Fud0Wq+4LxgnOcVB76QAMH/ce4s+Qvl5f1E74TqGmjdxvgzKLuZgOaAI+gEbAJ1LvL/x3gD3Cn737C9of9QYRDgeU13r3/vH9ftwa7R3x6576GXEZmOzmI+GwO/YKvNrpfeXXgDTvHDADFNbZ79HCO/9ihjd1YxejFPzua4IEfdnlQ9kV8uslyki8dhFG886OEdIoIefgO6mAsIJQUAAA==",
+  "Body": "H4sIAAAAAAAAAM2UyW7bMBCG34WHnKRIoiTKIWAURQoU6SEICveSIAdKHNlsKJHgYtQw/O6lZFmxg6LIpcuNmuWfb4Ya7pEU/YtF9GmPNgZaRNHGOW1pkjRSeR5z2F53ql8rXl83qkuYFglzktlki5O1UV7bhFRAMCzqKiW4bYoFsLzgGEOQ8NaBsUnNmhevv4J1yoCNy/xmMiXmaPuiavtB9CGBw63yvVs64+FKszXc+26ZXQkHnX0A8xAsyyxNUYQMyIBrQbbo8Dx8Wi/dsZWG9Q1ICRzRlkkLEeIgxRbMbrXTELKYd6pjLgS8ur6ZoPf0PBisMMBXogtwrNOI7lFgM9BB7xDtvZQRcsF7OvOgdDwfIgQ/9JA9V26ZOAdpRS/sBvjHoIRwiss4zWO8WKUlzTNa4MdAJEI4Gqaa5yU7n2pbN1Xw/z93lvyG8vx+on+Eanum7Ua5CRRX1QUoAZhBL8AuoE4if7+Nd8BN2X+G7R31R4VxAU9jupv/3l+P2zGzBnd75L5nwxqhy9ZxTNJijvwEWqrdsHt34RGYEsYO4u+42HVyjvw8sLyWTytSLkhGMlymJG8xucHouLjTWr/ZP0xoXj2OvTjlmBwfIkSzw0/Ttgv+JgUAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/restoreJobs",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:08 GMT"
+      "Fri, 28 Mar 2025 05:31:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "75"
+      "46"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_1.json
similarity index 52%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_1.json
index e0d3338dd8..2c1f4032bd 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTwW7bMAyG34XnuIqVWGp8bYGiPewwpJcNO9AWlRiVLU2SgwVB3n1ynbgN0AK9tL0RFPnz+wnxADV2NRlDCkqNJtAMFJlmR36/3juCErCPtsWYCl6eHr2B8vefIREaT2rdtBQitg7KAzRd7amlLkLZ9cbMIKbXc6yS0hgfZ0D/3NA9TdbYvAZpUghC0nKR6+VKyopLKbREuVKIicY03VNIHAfYetKpdhujCyVjtbG9yhTtrlrbbayqrmrbMnQNw2gwsB1nG297F9igzlUhUVUoinyB13WhJddJog+RfGAV1k+9+5nsWU8h4zk/pZgfcw+2GnXeofSUdgWBjIbj7JtQQ4cubG08g/LrC1CBNIFegF1AnUW+3sYH4E7dn8P2gfnPCnBMJ3Fe0/3L731z3RH9huLNyP0DhxOBS+s8k4up8JacsfvhrO4jtaf6ZwNZPvei+DtV3g0o03Suef7Kj+BLWsF4k6eLBT7nRTZfZFysc1EWopyvfsHxP5Nj744bBAAA",
+  "Body": "H4sIAAAAAAAAAMWTwW6DMAyG38VnaGgooeW6SVN32GHqLpt2CGBa1kCiJFRDVd99oVDaSpvUy7ab5di/P1v595DxOkMhMIek4MKgBzmKcoe6XbUKIQHeWFlx6wrOTy9aQPL23iVMqTFflRUayysFyR7KOtNYYW0hqRshPLDu9RTnTqmPDx7gp+q6x8kFLy9BShcCi5GFYcTjgNEim82Rh7MizWJHI8p6axzHHjYaC1e7sVaZhJBMyCb3c9xNKlmvZZ5OMlkRrkrCreCG7ChZa9koQzp1ivP0Uj2nFJ1EYyxqQ1KebRv17NaTGo0fhYshRXSfe5Rpr/MDpUZ3KzAoCjh4/4Rqaq7MRtoBlMbxFShDHEGvwK6gTiJ/v8YNcEP377DdMP+oAAdnidOZluPv/f7clus12rue+4l3FoHr1anPgtlYeY9KyLbz1dJiNTQcN/A/6KytxFj50LGcxwcxi+ZsyqY0ClhYULag0JtysCzQgEZ+EPp0vgqihLIkjF/h8AVLwH93HAQAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/restoreJobs/67e6335a7062fc48ea34fbc7",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "396"
+      "394"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:25 GMT"
+      "Fri, 28 Mar 2025 05:27:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "77"
+      "26"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_2.json
similarity index 52%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_2.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_2.json
index 226f2c8f07..ab8361efb9 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_2.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTTW/jIBCG/8ucY2OTGhJue2wPVbVKtdqu9oDNOEHF4AWcNhvlvy9p7LSRWqmX3RWX4WNe3nlg9tBI26AxqEC00gScgUKjt+h3q12PIEC5J2ucVPC6c+8NiB+wibEPghCPITqPGeN4NaeqWnJeU85Zy2Uaqs29Hroh75xdO1VnCre5xSgoL0pO8LbT93eeFd9WJfvlini9M093358vVUu6eKu6ZBLzKH2+/g0/j76C9qhWuks5sutB7EHbxmOHNoKwgzEziGl3ipWMY3yYAT73x+xz/ad5+JIygRa0yop5RtmqXIiiEsXVQwLRSv2WmE4hfFR9Om60fQyJ2B42Htt0diLXGDeoFyAjnLxxHZG9JjIaGciWkrV3Qx/IUT2Jc6lqyapyLhdN1XLaJokhRPSB1LJ5HPqvJ2ohoyUdlyaSN64+6Xzg0mN6VQhoWjjM/pPVYGUfNi6ORt959rPRC2MXpiaRf1/GJ8yN2X/H2yfuf1GAQ+qaCdP1+fe+jzu+ttVFPzBRMVEsH+DwBzyV54JGBAAA",
+  "Body": "H4sIAAAAAAAAAMWTTU/jMBCG/8ucG5w6iVN8Q6y0Yg97WJULiIMTT1qDE1u2U21V9b/jkDRQtCtxAW7WfLzzzMjvAWrR1ag1SuCN0B4XIFGrHbr9em8ROIg+mFaEWPCaunUa+P3DEPDKoVyrFn0QrQV+ANXVDlvsAvCu13oBIWZPbxmVxvdxAfjXDt3z5EaotyCN6pTforyKSkBTWiRpltDVOi14tuQ5vYtEKpYDK5FlWSHKlNGmzlcosryp6jLmteqefGQ9wNZhE2u3IVjPCam16WUicXfRmm5jZHVRm5YIq4gIWniyo2TjTG89GdQprqq36pJSjBK9D+g8qUT91Ns/8QTGoU+K7HIKETfGfplq1PkPpcN4T/CoGzguvgnVd8L6rQkTKC3LM1CGOIOegZ1BnUS+fo0PwE3dn8P2gfkvCnCMtjmd6Wb+vf8+dxBug+F65P4tBhvB+eo0YWk+V/5Aq81+8N5NwHZqeNkgeaT5vtVz5c+B5XV8WrJixZZsSYuUZQ1llxRG4062fuc/ynhW3sHxGdCW+zFABAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e432d5977b2776f7a7a7df",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/restoreJobs/67e6335a7062fc48ea34fbc7",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:05:05 GMT"
+      "Fri, 28 Mar 2025 05:31:46 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "38"
+      "34"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_3.json
similarity index 52%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_3.json
index 2b8cabfe65..5e2613f5df 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTQY/TMBCF/8ucm03iNvbWNwQSWg4cULks4jCJx621Thxsp6Kq+t9xNm12I4G0F+BmjZ/ffDPyO0ODXUPWkgKp0QZagSJrjuRPu1NPIAGH6FqMSfBy9dVbkN++j4VgPKmdaSlEbHuQZzBd46mlLoLsBmtXENPt7ayS03S+rIB+9uPrubNG8xpEm86EA6l3yQlYwaqsWGeM70ohi1IW/DERmSQHLmizLvVmK0TNhOBaoNgqxHRvTfcUEusZDp500h5i7IPM88a6QWWKjnet6/ZO1XeNa3PsTY7RYsiPLN97N/QhH92ZqgSqGnlVrvG+qbRgOlkMIZIPeY3N09B/SStwnkLGSnYt5X6qfXL15PMHSk9pnxDIaris/hNq6LAPBxdvoOx+AcqRZtAF2ALqZvLvx3gD3PX132F7Q/9nB7ik2NzW9PDye3+77oh+T/H9xP0ZxxjBcnSWifUs/EC9dacxeg+R2qv+eYCsLDyvfszKjyPK3J1pVr6ah7MNbWHK7TXVi/hxWXFZbB/h8gtaEiR5PwQAAA==",
+  "Body": "H4sIAAAAAAAAAMWTTU/jMBCG/8ucG5w6iVN8Q6y0Yg97WJULiIMTT1qDE1u2U21V9b/jkDRQtCtxAW7WfLzzzMjvAWrR1ag1SuCN0B4XIFGrHbr9em8ROIg+mFaEWPCaunUa+P3DEPDKoVyrFn0QrQV+ANXVDlvsAvCu13oBIWZPbxmVxvdxAfjXDt3z5EaotyCN6pTforyKSkBTWiRpltDVOi14tuQ5vYtEKpYDK5FlWSHKlNGmzlcosryp6jLmteqefGQ9wNZhE2u3IVjPCam16WUicXfRmm5jZHVRm5YIq4gIWniyo2TjTG89GdQprqq36pJSjBK9D+g8qUT91Ns/8QTGoU+K7HIKETfGfplq1PkPpcN4T/CoGzguvgnVd8L6rQkTKC3LM1CGOIOegZ1BnUS+fo0PwE3dn8P2gfkvCnCMtjmd6Wb+vf8+dxBug+F65P4tBhvB+eo0YWk+V/5Aq81+8N5NwHZqeNkgeaT5vtVz5c+B5XV8WrJixZZsSYuUZQ1llxRG4062fuc/ynhW3sHxGdCW+zFABAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/restoreJobs/67e6335a7062fc48ea34fbc7",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "415"
+      "414"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:07 GMT"
+      "Fri, 28 Mar 2025 05:31:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_1.json
index eea7c5d50d..4c2ea9a294 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTzW7CMAzH38XnltCwNpA32I4Tu2zaIW0cqEiTKEnZEOq7L4zCQNokLtuUi+WPv3+24j00wjSoNUrgSuiAGUjU7Rb9brlzCBykfTPaCglfkSevgb+8Hhyh9SiXbYchis4B30NrGo8dmgjc9FpnEFP0ZEsRR3vIAN/dofrcWIn2kqNNJlQM72ZUlgvGaspYpZhIT6pEo1uzCYljD2uPKuWuY3SBE9Jo28tc4nbSWbOysp40tiPCtURELQLZUrLytneBHNSTOBOyFlVZzMS8KRWjKkn0IaIPpBbNpnePaTzrMeS0oKOL+KPvwdZHnR8oPaZdQUCtYMj+CTUY4cLaxhG0oPNL0EUl8Ax6BXYFdRL5+zFugBurf4fthv6fCjCkkzit6f78e79fd/y6GaBTWubTWU6rZVHxsuLTxTMMH/DquR+cAwAA",
+  "Body": "H4sIAAAAAAAAAMWTTU/DMAyG/4vP7dKlXyP/AI5oXEAc0sbdoqVJlKSDaep/J2PdlwQSF+Bm2fHrx6/iPbRct6gUCmAdVx4TEKjkFt1uubMIDIR508pwAZfKk1PAXl4PCS8diqXs0QfeW2B7kLp12KMOwPSgVAIhVk+x4GGKxwTw3R66z4M7Lq85ZAyhqrHKi6IoF9W8mtMyq/KumGMWaZTUGx859rB22MW36xCsZ4S0ygwiFbid9UavjGhmrekJt5LwoLgnW0pWzgzWk4M6xUVTZxXt2mKBPC8EpRglBh/QedLwdjPYx7iecejTMr+bUsQdcw+mOep8Q+kwegUeVQdj8k+oXnPr1yZMoLSur1W6CvEMegN2A3US+fs1fgA3df8O2w/mfyrAGE/iZNP9+fd+bXe43AzQjJZplqd0scxKRiuW188wfgBgNCKZnAMAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e432d5977b2776f7a7a7df",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/restoreJobs/67e6344458616125063f41e0",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "336"
+      "337"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:10 GMT"
+      "Fri, 28 Mar 2025 05:31:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "63"
+      "36"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_3.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_2.json
similarity index 52%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_3.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_2.json
index 54a95021a2..215a87fb9b 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_3.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTQY/TMBCF/8ucm03iNvbWNwQSWg4cULks4jCJx621Thxsp6Kq+t9xNm12I4G0F+BmjZ/ffDPyO0ODXUPWkgKp0QZagSJrjuRPu1NPIAGH6FqMSfBy9dVbkN++j4VgPKmdaSlEbHuQZzBd46mlLoLsBmtXENPt7ayS03S+rIB+9uPrubNG8xpEm86EA6l3yQlYwaqsWGeM70ohi1IW/DERmSQHLmizLvVmK0TNhOBaoNgqxHRvTfcUEusZDp500h5i7IPM88a6QWWKjnet6/ZO1XeNa3PsTY7RYsiPLN97N/QhH92ZqgSqGnlVrvG+qbRgOlkMIZIPeY3N09B/SStwnkLGSnYt5X6qfXL15PMHSk9pnxDIaris/hNq6LAPBxdvoOx+AcqRZtAF2ALqZvLvx3gD3PX132F7Q/9nB7ik2NzW9PDye3+77oh+T/H9xP0ZxxjBcnSWifUs/EC9dacxeg+R2qv+eYCsLDyvfszKjyPK3J1pVr6ah7MNbWHK7TXVi/hxWXFZbB/h8gtaEiR5PwQAAA==",
+  "Body": "H4sIAAAAAAAAAMWTTW8bIRCG/8ucvQvLfrncokiRmqqHVttDXfWAl1kbhYUVsE5dy/+9ON51YimRcml7Gxjm5Z0H5gCtMC1qjRJ4J7THBUjUaodu3+wHBA7SPhpthYTnzDengf+AbQiD54Q49ME6TKoaq7woinJZZVXGSlrlXZEhTXc+G2XaW7Oxcp1I3KUGA2c1zWrSrFaUqtvN5+aT/7J/vG/89ntZ3N1cq7K6rmnFurZYosiLrkJMg3Dp5jf8PPnyyqFsVB9rRD8AP4AyrcMeTQBuRq0XEGJ2jqUIU3xcAP4aTtWX/s9rfxMrgVFWJjRP2LKhFc8LntNVBNEJ9ZKYiiG81X08rpV58JHYAbYOu3h2JtdqO8onIBOctLU9EYMiImjhyY6RjbPj4MlJneFy/ZKCZAyjxOgDOk/Won0Yh69naj4p8w/T1kzy3q7POm+4dBhfFTzqDo6L/2TVGzH4rQ2T0Vee/WL0ytiVqVnk37fxDnNT9d/x9o77nxTgGKdmxvTx8ntfxx2ex+pqHkrO4kjUKzj+AVwC1y1GBAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/restoreJobs/67e6344458616125063f41e0",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "415"
+      "417"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:09 GMT"
+      "Fri, 28 Mar 2025 05:34:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "53"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
new file mode 100644
index 0000000000..d2cd1f44c0
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL1Sy07DMBD8lz0ndeS0SZsbiAsXDm1PIA6uvUmtJrbxoyJU/Xe26gOQ4MrRs7szszs+gLRuXGKnrQnQvLxmoDBIr10kBBqIGGIejHBhayNkgO9Oewx3kWq84LO8KHO+WBezhk+bon6mltbjW0Ijx/XokNqsUTgIo6ikFb2rGquS13VdVLyV0zmKctpWiFTvtdmdbBxg67Gl3m2MLjSMyd4mlSvcTwZrOqs2E2kHJpxmIvYisD1nnbfJBXZi5zjffGdXnCNRpBDRB7YRcpfckhaztEk+KxcXiF33PLP84dFjT8YC9i0cs382epP/IfdD6jINR4rS2V7L8THicMnWoyNErDA+ieGUza8S1zPc8nu45heiiIm4gAJOeEasFx2u9Afej/RZoCkyiOfBLzU4fgImdK2caQIAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/snapshots/67e632777062fc48ea34f6ee",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "322"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:24:08 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "83"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_2.json
new file mode 100644
index 0000000000..4d8ee6f9af
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_2.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL1Sy07DMBD8F5+TOnLapM0NxIULQm1PIA6uvUmtJrbxOhWh6r+zpQ+oVK4cPbs7M7vjHVPOD3NojLPIqte3hGlAFYyPhLCKRcCYopUe1y6yhMGHNwHwLlJNZGKSZnkqZstsUolxlZUv1FIHeO/BqmE5eKA2ZzV00moqGU3vooQiF2VZZoWo1XgKMh/XBQDVW2M3Bxs7tg5QU+86Ro8V56p1vU41bEeds43Tq5FyHZfecBlbiXwreBNc75Ef2AVMV7/ZtRBAFD1GCMhXUm16P6fFHG2STvLZCeLnPY8sf3gM0JIxhLZm++SfjV7kr+SupE7TbE9RetcaNTxG6E7ZBvCEyAXEJ9kdsrkpcT7DJb+Hc34YZeyJixn7HFxDI/iNuiAbWJhPuB/ow7AqS1g8Dv8osv0XzSwiHG0CAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/snapshots/67e632777062fc48ea34f6ee",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "326"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:24:12 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "51"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_3.json
similarity index 55%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_2.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_3.json
index 5a98cf87bf..be51a3bf92 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_2.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1Sy07DMBD8F5+TOnGbuM0NxIULQm1PIA6OvUmtJraxnYpQ9d/Z0geqBFeOnt2dmd3xnkjrxiW02ppAqte3hCgI0msXESEViRBiGoxwYWMjSQh8OO0h3EWssYwVaTZNGV/nZVXMqix7wZbGw/sARo7r0QG2WaOgF0ZhSSt8lxxm05zNF5zXjPOy4YIvSgFY77TZHm3sycZDg72bGF2oKJWdHVSqYDfprWmtqifS9lQ4TUXsRKA7RltvBxfokZ2pggtVi7LIp2Iui4azBimGEMEHWgu5HdwSF7O4ScpydoboZc8Tyx8ePXRoLEDXkEPyz0av8jdyN1LnaXLAKJ3ttBwfI/TnbD04RMQK4pPoj9n8KnE5wzW/h0t+IYo4IBfR5tnbFkfCN2q9aGGlP+F+xA9Dqiwh8TT8o0gOX03kBS5tAgAA",
+  "Body": "H4sIAAAAAAAAAL1SsU7DMBD9F89JbDlt0mYDsbAg1FYMIAbXvqRWE9vYTkWo+u9cSVuoBCuj39299+6e90RaNyyg0dYEUr28JkRBkF67iAipSIQQ02CECxsbSULg3WkP4SZijTM+TVme8vmKTSs+qVj5jC21h7cejBxWgwNss0ZBJ4zCklb4Lkoocl6WJSt4LSczEPmkLgCw3mqzPdrYk42HGns3MbpQUSpb26tUwS7rrGmsWmfSdlQ4TUVsRaA7ThtvexfokZ3DbP2TXXEOSNGHCD7QtZDb3i1wMYubpNN8foLoec+R5Q+PHlo0FqCtySH5Z6MX+Su5K6nTNDlglCP+hFxjmLOMZQVyONtqOdxH6E6Ze3CIiCXEB9EdM/tV+nyeS65351xDFLFHLqLNo7cNjoQv1HrRwFJ/wO2AH4lULCFxHP5WJIdPpRjQOYUCAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/snapshots/67e632777062fc48ea34f6ee",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "333"
+      "338"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:05 GMT"
+      "Fri, 28 Mar 2025 05:24:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "55"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_4.json
similarity index 54%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_4.json
index eb5806c6fd..9f1b119531 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_4.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SPW/CMBD9L54THAyJIVurLl06AFOrDhf7EiyS2LUd1BTx33uIjwqpXTv63d177+75wJR14wobY/vAyrf3hGkMyhsXCWElixhiGnpwYWsjSxh+OuMxPESqiUzkaTZLhdxMizKfl1n2Si21x48BezVuRofUZnuNHfSaSkbTu5A4n03FYillJaQsaglyWQBSvTX97mTjwLYea+rdxuhCyblq7aBTjftJZ/vG6mqibMfBGQ6xhcD3gjfeDi7wE7vQuQRdQZFPZ7BQeS1FTRRDiOgDr0DtBreixSxtkoqpuED8uueZ5Q+PHlsyFrCt2TH5Z6M3+Tu5O6nLNDtSlM62Ro3PEbtLth4dIbDG+ALdKZtfJa5nuOX3dM0vRIgDcTEKeMAzYj00uDZf+DjSZ2FllrB4HvxRY8dvjoEG8GkCAAA=",
+  "Body": "H4sIAAAAAAAAAL1SQW7CMBD8i89JHDmQQG5UvfRSVYBaqVUPxt4Ei8R2bQc1Rfy9CwEKUnvtMbOzM7MZ74hoTCefnNkqCY6UZPayIBERxvZzqJXRnpRv7xGR4IVTNiCCpAA+xF5z69cmIB0+rXLgZwFnLGXjOM1iNl2m45KNyrR4RUrl4KMDLfplbwFpRktouZY4UhK/8wLyjBVFkeasEqMJ8GxU5QA4b5TeHGLsyNpBhdx1CNaXlB6zxxK2SWt0beQqEaal3CrKQ8M93TJaO9NZTw/qDCara3XJGKBE5wM4T1dcbDo7x8MMXhKPs+kJouc7B5U/MjpoMJiHpiL76J+DXuxv7G6sTttkj1UO+DNqDWVOkjTJUcOaRon+IUB76tyBRYQvIDzy9tDZr9bn33Pp9f7cqw88dKhFlMYHVuOKP6LG8RoW6gvuenxIpEwjEoblH0ey/wZWzD5qmwIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/snapshots/67e632777062fc48ea34f6ee",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "329"
+      "352"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:00 GMT"
+      "Fri, 28 Mar 2025 05:26:40 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "84"
+      "35"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_3.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_5.json
similarity index 53%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_3.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_5.json
index 0b87ed7db3..426bcc1d4b 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_3.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_5.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsU7DMBD9F89JnLhN3GYDsbAg1FYMIAYnvqRWE9vYTkWo+u9cSVuEBCuj39299+6eD6Q2dlxBq4z2pHx5jYgEXztlAyKkJAF8iL0W1m9NIBGBd6sc+JuANZayPE5nMeObrCjzeZmmz9jSOHgbQNfjZrSAbUZL6IWWWFIS3wWH+SxjiyXnFeO8aLjgy0IA1juldycbB7J10GDvNgTrS0rrzgwylrBPeqNbI6ukNj0VVlEROuHpntHWmcF6emJnMudCVqLIs5lY1HnDWYMUgw/gPK1EvRvsChczuEnMMnaG6GXPieUPjw46NOaha8gx+mejV/kfcj+kztPkiFFO+BNyTWEukjQpkMOaTtXjfYD+nLkDi4hYQ3gQ/SmzX6Uv57nmenfJ1QcRBuQiSj860+KI/0KNEy2s1QfcjviRSJlGJEzD34rk+AnLK29MhQIAAA==",
+  "Body": "H4sIAAAAAAAAAL2Sy07DMBBF/8XrJg7Os9kVsWGDUFuBBGLh2pPUahIb26kIVf+dSV9QCbYsPY9zZ3xnR0Sje/lo9VZJsKQks+cFmRChzTCHWunOkfL1DQMWuAc581jCIpYGURywYhmlJcvKOH/BHglOWGU8NmGRB+cD13Hj1tpjFj6MsuCuAdMDIC/TmxFQWXjvoRPDcjCAZbqT0PJOYkpJfGc5ZDHL8zzKWCWSAnicVBkA5hvVbcZJd2RtocLatffGlZQe1gskbMNWd7WWq1DolnKjKPcNd3TLaG11bxwd6QyK1U+6ZAwQ0TsP1tEVF5vezHExjZsEaTw9heh5zyPljxktNDiYg6Yi+8k/D3qRv5K7kjp1kz26fYw/IetoZhFGYYYMoxslhnsP7eksLBiM8AX4B96Onv0qff6ei693Z1+d575HFh5caxrACzsEteU1LNQn3A54R6RMbpKiiCMWFRPij5BvZbL/Aurbw5DGAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/snapshots/67e632777062fc48ea34f6ee",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "346"
+      "372"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:25 GMT"
+      "Fri, 28 Mar 2025 05:27:53 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "59"
+      "39"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_provider_regions_1.json
index 4f309f5850..f6f3352e53 100644
--- a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeh2FMop0OPCGVRwMkdie1rC0KUnqw8T/vlgRdUqbPebkyzlfcpIcEKPpt0T21wHtBETIRjulMmljHDCehy8h7BsJT2MebhsBTzDJKCaKEYn3LRwLnmcS9/rQaYXdHgm3pNe12uQ16EY9AjpFLhUIiTPB9zQEgQXElKfyjaZ6LoQBz1PlKJFD7YJIx135NUVBOGOrWctIDJM8cawaVZDIGYiZjjhWs4nqSADTwhJYhI7r01DmTJ03Q1OpSBqAT3/gHCF7QhnZMpifHYpgCBHRa5B9cqijlCSgMy79jef6i42FjvUbJiJMPkKtCmjlPWb6W61gShMN3M3Amyzm7qjcyltuJtP5YlhJPdN6DpV6XaB2BWQqf+FKi/quQX/cmRnkT5eLYXUn78jS3d6RnQqyaJaR55Ws8ryS5p5Gp2RIlfqNPbO7oDmTmu8mlL5X/6FK/T9GZv76wVY/sbsWdI3JfunBfd4Krq9xq1kMLx/tKenKL0KKK8KKvxjZ1vEXBTxO2xQGAAA=",
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmrU6lUEaRDgd+YRUHQyTaWw1Lm5KkPkz874sVUae02WNuTu49yU1yQIym3xK5Xwe0ExAjF+2UyqSL8YbxPHqJYN9IeLrl0bqx4QkmGcVEMSLx3sFbwfNM4nYH2g501x2r7cSbVhdIsxU5DugUuVQgJM4E39MIBBawpTyVbzTVcxH0eJ4qT4kcahdEev4irCkKwhvaVi0jWxjliWfXqIJETkBMdMSzLQvVkQCmhSWwGB2Xp6HMmTpvhqZSkXQDIf2Bc4TsCWVkzWB6diiCEcREr0HuyaGOUpKAzjgPV4EfzlY2OtZvmJgw+Qg5FdAieMz0t1rBlCbq+ateMJpN/UG5VTBfjcbTWb+Seqb1HCr1ukDNCshU/sKVFg19g/74EzMoHM9n/epO3pGlu70jWxVk0SwjzytZ5XklzT2NTsmQKvUbBmZ3QXMmNd9NKH2v/kOV+n8MzPz1g61+YncteDUmO6UH93kruLzGbasYXj7aU9JFWIQUV4QVfzFy7eMv5sZcOxQGAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:45 GMT"
+      "Fri, 28 Mar 2025 05:07:26 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "77"
+      "57"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_1.json
similarity index 72%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_1.json
index ba67abddc8..a005eb5c52 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtNTM5IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTUzOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/restoreJobs",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/flexClusters/backupRestores-539/backup/restoreJobs",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:08 GMT"
+      "Fri, 28 Mar 2025 05:31:46 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "60"
+      "54"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_1.json
index 99c4656ff0..b776fa75e8 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtNTM5IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTUzOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/flexClusters/backupRestores-539/backup/restoreJobs/67e6335a7062fc48ea34fbc7",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:08 GMT"
+      "Fri, 28 Mar 2025 05:27:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "47"
+      "55"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_2.json
similarity index 70%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_2.json
index 142f1804e4..c223c39843 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6335a7062fc48ea34fbc7_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtNTM5IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTUzOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/flexClusters/backupRestores-539/backup/restoreJobs/67e6335a7062fc48ea34fbc7",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:24 GMT"
+      "Fri, 28 Mar 2025 05:31:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "48"
+      "52"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_1.json
index fa14cb3708..6b0b9711ae 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_restoreJobs_67e6344458616125063f41e0_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtNTM5IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTUzOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/restoreJobs/67e432d5977b2776f7a7a7df",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/flexClusters/backupRestores-539/backup/restoreJobs/67e6344458616125063f41e0",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:09 GMT"
+      "Fri, 28 Mar 2025 05:31:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "65"
+      "36"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
similarity index 71%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
index fe2ad1e57f..6c890cc026 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_flexClusters_backupRestores-539_backup_snapshots_67e632777062fc48ea34f6ee_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtNTM5IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTUzOSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/flexClusters/backupRestores-539/backup/snapshots/67e632777062fc48ea34f6ee",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:00 GMT"
+      "Fri, 28 Mar 2025 05:24:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "51"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_backupRestores2-604_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_backupRestores2-604_1.json
new file mode 100644
index 0000000000..132f2cf314
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_backupRestores2-604_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV227bOBD9lQWfE+viWHb1pthq4IUvgaU02yyKgJLGNhuKFEjKhRv433doKqmdtsC+tH0wIM/1kDPn8JnQakdFCdVYijXbtIoaJgWJn0nZaiPrZQNCaz5mzRaUi8m5DkIS//vpgtRMsLqtU0ELDhU6bpU0spScxCSfZcFjSC6I4fo0fS4rQPckfZ/czXJyuCAFLZ/apitCYqNaQCPDcAGlkcqigRfvmnKNbgW0ulWwBgWIHutpKKWoqNrbiiVH8KDyfWNdq/R2Nh0nWZojmtJVxUNmRjGx0VjdZmBBAxP8YULoh4NLv38ZjnJ/EAeDuP/uAVMrpp8y9hVurknc93u+s9xThdfwcqz3d7PZx8f7ZDVPJ5iC4NS+sd0SswJt8H52rAI8ElksFylGbLgsKB87wBnw9ZwKuoEq21JVYd3XE2+UbJsp3gCJhhD1/WE0GEVBFIQDP+qvw+idvWt24i+GfhSuy6sR0P4VjEaAfk4L4NoNjzPxZD+fyRYvEvO2xjQ69rySy7a6rGDXq6XYyKrolbL2aMM8ajjV3i70jmC09zMkXjcA7bnZ2qNLBTq8jPwrYqfHjyPja5zW7+7f2TzljH/LQr9COoNw1v40+s9h1oI2eivN/0H8LfZgqWo9k+s5/SzVB+xyZDkZ9Xzy6jsz9yJ0CFrbpf7xEBva6hNGNsy8obCChrPyKChZA6XbtdMNpecbOixsy7Y+rj5GB7bEBrOdcLh8ZAffG1bqriRWFNpYCbPUxNrzwO+4Ol3eZpapPjIVCv1B8raGThOyPFlMkpXlqEDmjmUrDIl9VALaGpmVlB+5hzIo66a1qvC9BjUKKoZSsoP0jUdjPkzkF3HuODhcVj/eVjugDzgKkzX+iqP1DxYwk4qZPYmH9o+TooWbcXKfESerS8H3v+py3Ty7lnfZY5pk+WNwXNCvUsD058sx6hMX0yU/4OdfLlNJacagTNd9mq1uVstl/k+AGYjevKSMV2mSTxc39k2im04FkXEo38cltY+XexreznPnmLHCCVEN2R55WmPBWZ6Rw39kM+rMQwcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e6307658616125063f2692/clusters/backupRestores2-604",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "802"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:39 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "59"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_backupRestores2-604_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_backupRestores2-604_2.json
new file mode 100644
index 0000000000..a7f1bdefb6
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_backupRestores2-604_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVWbY/aOBD+Kyd/6JdbyAtLoJFWJwq04gTLimS7dz1VKycZwLuOHdkOFV3x328chxb2ttVJp14lQOB5ezLzzGOeCC12VORQjKVYs02tqGFSkPiJ5LU2slxWILTmY1ZtQTmflOsgJPFfHy9IyQQr63IqaMahQMONkkbmkpOYpPMkuA/JBTFcn4YvZAFonkzfjm7nKTlckIzmj3XVJiGxUTXgIUN3AbmRyqKBo3VNuUazAlrcKFiDAkSP+TTkUhRU7W3GnCN4UOm+sqbV9GY+G4+SaYpocpcVHzIxiomNttm1oTYW05NSio0sstjzHCwF2Ab8CDuRf9nRW/Tq+D6+uuxBflp3W/9OAbuuABOHAz8YXHw/NvgPseH3Yr3fcFZXtoGvaG22iaxVDle0wDm9UlBxltMEzBU1nOrOQ3i5L/kxNbbm2IVE7b424letdi8342UgTftxOgYm+MY8oR/2O36vEw5Tvx8H/bj3+gMWK5h+TNhnePeGxD2/67uTO6oQ65Ejb2/n8z/v70arxXSCIThpta/s6EZmhUiQbDtWAPKDXC+vp+ix4TKjfOymnwBfL6igGygS+4yY9wt9NkrW1czOOxpA1PMHUX8YBVEQ9v2otw6j15a47MSeDfwoXOeXQ6C9SxgOAe2cZsC12wTOxKP9+kS2yEqM2xpTaWxczmVdNM1pG9XNZenRinnNFLxd6DVgtPctJF7LZt0OYXU6BGJXgTf852vs/f9dvz3zWmb8LjP9BdIZhLPyp94/D7MWtNJbaf4N4q++B6t71jJ5s6APUr3HKo1kkmHXblFrOzvuRmgQtLSkfnmIFa31ibxVzDzTw3Z9G+GqIHdcO2UoPWfoILMl67KhPnoHNsUGo50Ku3jcDr43LNdtSsworArkYFcTcy8Cv93V2fImsZvq46ZCpt9LXpfQCmySjq4no5XdUYGbO5a1MCT2UQlQhWSSU97sHt4psqxqqwr/FHTUloKhLu9g+syiMR4m8pM4NxwcLqsfz7Md0AYcVd4e/ohH6x0sYCYVM3sSD+wPJ0XXbsaju4S4O2op+P5HNdfNsy15m9xPR0l6HzQE/SwFzL5NjmGPOJ82+AN+/cVFKinNGJRpq8+S1bvVcpn+EbgLwhxDZpO5VVxDN60C4rahdDcEtf8C3B37fJY7txUrnA7VkOxxR0tMNk8TcvgbDgWF3YwIAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e6307658616125063f2692/clusters/backupRestores2-604",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "908"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:24:07 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "53"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_provider_regions_1.json
index 1cd09fdb75..41a595f683 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e6307658616125063f2692_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHLGds5uhTKKdDjwC1txMESivdWwtClJ6sOG/32xIuqUNnvMzcm9J7lJfhCj2ZdE7ucP2gpIkIu2SuXSxXjNeBE/xLBrpTzb8HjVWvMUk5xiohiReGfjjeBFLnHXgY6drO0Xx1nZjtNNHOI8d2NLpyikAiFxLviOxiCwgA3lmXylmZ6LoceLTHlKFNA4IdLz52FDURDe0Go3crKBUZF6VoMqSOUExERHPKvdRk0kgGlhCSxB+8VhKAumjpuhmVQkW0NIv+EYITtCGVkxmB4dymAMCdFrkHtwaKKMpKAzzsJl4IfR0kL75gWTECZvIbsGmge3mf5WK5nKRD1/2QtG0dQfVFsFs+VoPI36tdQ9rftQpdcJeqyBTOVPXGXR0Dfojz8xg8LxLOrXd/KKrNztFdmpIctmGXmeyTrPM2nuaXRKhlSl3zAwuwuaM6n5ZkLpe/UfqtL/fWDmrx9s/RO7asGTMelUHtzHpeDiHLfa5fD00R6SzsMypLgirPyLkWvtfwHxTeOLFAYAAA==",
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmrbNuhTKKdDjwC6s4GCLR3mpY2pQk9WHif1+siHOTNnvMzcm9J7lJDojR7FMi7+OAdgIS5KGdUrn0MN4wXsQPMexbKc+2PF63NjzFJKeYKEYk3jt4K3iRS+x2wW1bXbfz5Nqu7XQst5047rOjUxRSgZA4F3xPYxBYwJbyTL7QTM/F0ONFpnwlCmhcEOkHi6ihKAh/aFuNnGxhVKS+3aAKUjkBMdER37Ys1EQCmBaWwBJ0XJ6GsmDqvBmaSUWyDUT0C84RsieUkTWD6dmhDMaQEL0GeSeHJspICjrjPFqFQTRb2ejY/MEkhMm/kFMDLcK/mX5XK5nKRL1g1QtHs2kwqLYK56vReDrr11L3tO5DlV4XqF0DmcpfuMqiUWDQn2BiBkXj+axf38kbsnK3N+RjDVk2y8jzStZ5XklzT6NTMqQq/Yah2V3QnEnNVxNK36v/UJX+bwMzf/1g65/YTQs6xmS38uDefwour3HbKoeXj/aUdBGVIcUVYeVfjDz7+A1ggvcXFAYAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e6307658616125063f2692/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:48:04 GMT"
+      "Fri, 28 Mar 2025 05:15:38 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "64"
+      "57"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 819b9ea598..9425986e83 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:46 GMT"
+      "Fri, 28 Mar 2025 05:07:25 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_1.json
index 96f42cb470..c734dc3688 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMSAibx26lq1S6sOh30GFIORz6RDxL+XKGpaloqF+Z7ePel0V6bdRBHDk5+GyFSWMB0QIhqmmMhEmWZ5KuTrUaq8UoV8ZwnrbjNZYSFMWYGpQZbHHE66tJWwy9x1w5mY+riyNqBd2DbGkRTn2vnJpAYvh94PjTf1Qfuew9hxiA6IXwRvgp9G4v/YA7pFSegsm5MdVnDthwjdgIEe21b2lfkPvFPN/TybWn7QfUoMRKiB8I225az5fZpG3NZy53ZqCF4jEW7qeLD7tHy1XUTXUdzQ8svOnwkboMcFr0Gfp/EFKfqAlKLANBfVYvOheb79fYnWgDwJyK1AI7AyRmqDBZu/ARchdWVLBAAA",
+  "Body": "H4sIAAAAAAAAALWTvW7DMAwG30WzHRmM/+C1U9eiXVp0oKXPiRHFMkQ5HYK8ex0ETZul8OKZh+MBBM/KuEkiwpOfhqiaLFEmgCOsahRlVKTZNqX6NSuarGqoeFeJ6q+zskJJqNsqK6kzeQ3e5pYI89z1w0FU83FW+4BuZvcxjtJobZyfbGpx2hz9sPO23Rh/1Dz2mqNj0SfSu+CnUfQ/9gA3KwWuU5dkhRXa+CFyPyDIfduD/cH8B16p5naeRS0/6DolliO3LHiTZTmP/DpNI5a13LiVGoI3EMGijju7TsvXvo9wvcQFLb/s5TNRAx8x4y2bwzS+QKIPkBSEtM7L2ebD7vn69wU6y2VNvO0IllBZWxqLXF2+ARWraSZLBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:43 GMT"
+      "Fri, 28 Mar 2025 05:07:23 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2232"
+      "2165"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_2.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_2.json
index 6aff0a4345..aec44d67e2 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_2.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_2.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniMkBTsqaqWvVLq06HPbxoRiMfCYdIv57iaKmZalYmO/p3ZNOdxXajhzIn9zYB1EkkdCeMJARhYAE8jhJY1Cve1VkeQHwLiLR3mbqQBlUsEdTosr3KR61goye5rlt+zOL4uMqGk/VzDYhDFxIqa0bTWzosutcXztT7rTrJA6txGCR5QVk7d04sPzH7snOSiZbiSnaYIXUrg/Y9uT5sW1hX5j/wBvV3M+zquUH3abEYMASmd54Xc6S36ZpoHUtd26jBu80MdOqjge7TctX0wayLYcVLb/s9BmJHjua8RL1eRxeiIPzxBATUJxBNuucr59vj59TZVAdAdMKyAAdjFHaUCamb8zVM0dMBAAA",
+  "Body": "H4sIAAAAAAAAALWTvW6DMBRG38UzxGBiQ71m6lq1S6sOxr78KMZGviYdIt69RFHTslQszPfofEeyfCXaThghnPzkIpFZQnQAFcEQSVjGeJoVKateMy5zLovynSSkv91ECaLISsErkYuc8UwUDRNPbLnb3p2RyI8r6QI0C9vFOKKkVFs/mdTA5TB413pTH7QfqBp7qqJVSC+MtsFPI9J/7AHsokSwDZmTHSao9i6q3kHAx9rKvjL/gXequT/PppYfdJ8So6KqFcIbbstZ8/s0jbCt5c7t1BC8BkTY1PFg92n56voItse4oeWXnT8T4tQAC14rfZ7GF8DoAyBLgUF6FNWi86F9vn18Do1RomJqmQTDoDRGaANHMn8Dw1aSREwEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "288"
+      "290"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:21 GMT"
+      "Fri, 28 Mar 2025 05:15:34 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1645"
+      "2951"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_1.json
deleted file mode 100644
index 65cfdff4c2..0000000000
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoWlSaFjeQhtQp36gJsDGNCEnuW09HDuynU4F9b/vug6sZR/aC9tDpdT33uNj33uOnwgt11QUUA6kWLBlo6hhUpDoiRSNNrKa1SC05gNWr0C5nIxrPyDR5y9HpGKCVU2VCJpzKDFwpaSRheQkItk49e8DckQM1/vlE1kChofJRXw9zsj2iOS0eGjqFoRERjWAiwzTBRRGKssGnqMLyjWGFdDySsECFCB7xNNQSFFStbGIBUfyoLJNbUPz5Go8GsRpkiGbwqHiIVOjmFhqRLcVCGhgiD8sCLrB6XG3dxz0M78f9cLoJLzD0pLph5Q9wuU5iXrdTtet3FKF1/B8rIvr8fjT/W08nyRDLEFyalPb3WIzB23wftasBDwSmc6mCWYsucwpHzjCKfDFhAq6hDJdUVUi7suJl0o29QhvgPRDOAnK05CWOe2f+j16VpwuwmCBaGwvnr8PwzwIw/4ipOEJnOQY5zQHrl3zOBMP9vOJrPAisW5lTK0jzyu4bMrjEtadSoqlLPNOISuP1syjhlPtrQNvR0Z7v2PitQ3QnuutPbpUoI8D306EAr7rGF9gs/7x9u2Sp9zaB5nrF0YHDA5238/+b5S1oLVeSfM3hH/kbq1ObWR4PqFfpbrBTXYSJ2edLnmJHSx3+hgQtLIT/csO1rTRe2qsmXklXwU1Z8XOTNIaCjdn+9NJD6ezZ1FFU+3GHrN9C7HEamcarh6VwTeGFbqFREShjbUvK0vEnvjdVqej2VVqVdpFlUKubyRvKmj9IM3i6TCeW30KVO1ANsKQqIsuQBsj04Lyne7QAmVVN9YRfvafWkHJ0EbWkLyKaKyHofwmDgNbx8t6x2u0LcaAoynZxbc4Wm9rCTOpmNmQKLR/nA1NXYvj25Q4S50Jvnmry3X9bLe8Tu+TOM3u/d18PkoBoz8Mh7U2m9MW3+HnO1eppDQDUKbdfZTOL+ezWfbRxwpkb55LBvMkzkbTS/segTXs3Wja58o9Bq+7uHZymGNfqIZ0g9qsEGacpWT7HctovPo1BwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "795"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:46 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "489"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_1.json
deleted file mode 100644
index 4fa0ae3cf1..0000000000
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoWlSaCBvoQ2oUz9QE2BjmpCT3LYejh3ZTqeC+t93XQdW2Ib2wvZQKb0f5x773nv8SGi5pqKAciDFgi0bRQ2TgkSPpGi0kdWsBqE1H7B6BcrFZFz7AYm+fD0gFROsaqpE0JxDiY5LJY0sJCcRycapfxeQA2K43k+fyBLQPUzO46txRrYHJKfFfVO3ICQyqgE0MgwXUBipLBt48i4o1+hWQMtLBQtQgOwRT0MhRUnVxiIWHMmDyja1dc2Ty/FoEKdJhmwKh4qHTI1iYqkR3WYgoIEh/jAh6AbHh93eYdDP/H50dBwFvVtMLZm+T9kDXJyRqNftdJ3lhiq8hqdjnV+Nx5/vbuL5JBliCpJTm9pWi80ctMH7WbMS8EhkOpsmGLHkMqd84AinwBcTKugSynRFVYm4zydeKtnUI7wB0g/hKFgEPi1z2j/2e/Sk6AdHcIpobM/fOw3DPAjD/iKkIZpC9HOaA9eueZyJe/v5SFZ4kZi3MqbWkecVXDblYQnrTiXFUpZ5p5CVR2vmUcOp9taBtyOjvT8x8doGaM/11h5dKtDBYdgjtnl81zG+wGb94/KtyVPO9lHm+pnRCwYvqu9H/zfKWtBar6T5G8I/Y7d2T61neDah36S6xiK7FScnnS559r0wd/roELSyE/3bDta00XvbWDPzan0V1JwVOzFJayjcnL0xnb1jW7GpdmOP0b6FWGK2Ew2Xj5vBN4YVuoVERKGNlS+7log98bvtno5ml6nd0i5uKeT6WvKmglYP0iyeDuO53U+BWzuQjTAk6qIK0MbItKB8t3cogbKqG6sIv+pPraBkKCNrSF55NObDUH4XLx1bx8tqx2u0LfqAoyhZ43scrbe1hJlUzGxIFNo/ToamrsXxTUqcpM4E37zX5bp+tiWv0rskTrM7fzefD1LA6I3hWBAX0ybf4ucHl6mkNANQpq0+SucX89ks++RjBrI3TymDeRJno+mFfY/ACvZuNO1z5R6D111cu3WYY1+ohnSDu1khzDhLyfYHk9imxDUHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f21adba6513a8c624e9/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "791"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:23 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "499"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_1.json
new file mode 100644
index 0000000000..2ed1f94023
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVyW7bMBD9lYLnxFocL9VNtZXAhZfAUpIuKAJaGtlsKFIgKRdO4H/v0FRSO22BXtoeDMgczptHzrzHJ0KLLRU5FCMpSrZuFDVMChI9kbzRRlaLGoTWfMTqDSi3J+M6CEn0+csZqZhgVVMlgq44FBi4VtLIXHISkWyaBvchOSOG6+P0mSwAw+PkMr6ZZmR/RlY0f2jqFoRERjWAiwy3C8iNVJYNPEdLyjWGFdDiWkEJCpA94mnIpSio2lnEnCN5UNmutqFlcj2djOI0yZBN7lDxkKlRTKw1otsMBDQwxh8mhH7YO/e75+Ew83uRP4jCwSdMLZh+SNkjXL0jUdfv+G7ljiq8hudjXd5Mpx/v7+LlLBljCpJTu9pWi80StMH72bIC8EhkvpgnuGPN5YrykSOcAi9nVNA1FOmGqgJxX068VrKpJ3gDpD+AfgjD1cDvh2V+MQTavSjCEBCNHcXL3rAf9IOw5/e7ZeCXthecroBr1zzOxIP9fCIbvEjM2xhT68jzci6b4ryAbaeSYi2LVSeXlUdr5lHDqfa2oXcgo73fMfHaBmjP9dYeXSrQ573uW2Kbxw8d4yU26x+Xb5c85dbey5V+YXTC4KT68e7/RlkLWuuNNH9C+MfevdWpjYzfzehXqW6xyEHiZNjxyUvsZLnTx4CglZ3oX3awpo0+UmPNzCv5Kqg5yw9mktaQuzk7nk44nc6itBWb6jD2uDuwEGvMdqbh8lEZfGdYrltIRBTaWPuyskTsWeC3Op0srlOrUh9VCit9K3lTQesHaRbPx/HS6lOgakeyEYZEProAbYxMc8oPukMLlFXdWEf42X9qBQVDG9lC8iqiMR/G8ps4DewdL+sdr9H2GAOOpmQX/8bRuntLmEnFzI5EA/vH2dDctTi+S4mz1IXgu791ua6fbcmb9D6J0+w+OMznoxQw+f1wwIC4PW3yJ/x84zKVlGYEyrTVJ+nyarlYZB8CzED25jlltEzibDK/su8RWMM+jKZ9rtxj8LqLWyeHJfaFakh3qM0KYaZZSvbfAYzdssY1BwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "795"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:26 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "529"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_1.json
similarity index 53%
rename from test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
rename to test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_1.json
index 2ce12b4732..2ab49ba2a3 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTwW7bMAyG34XnuIqVWGp8bYGiPewwpJcNO9AWlRiVLU2SgwVB3n1ynbgN0AK9tL0RFPnz+wnxADV2NRlDCkqNJtAMFJlmR36/3juCErCPtsWYCl6eHr2B8vefIREaT2rdtBQitg7KAzRd7amlLkLZ9cbMIKbXc6yS0hgfZ0D/3NA9TdbYvAZpUghC0nKR6+VKyopLKbREuVKIicY03VNIHAfYetKpdhujCyVjtbG9yhTtrlrbbayqrmrbMnQNw2gwsB1nG297F9igzlUhUVUoinyB13WhJddJog+RfGAV1k+9+5nsWU8h4zk/pZgfcw+2GnXeofSUdgWBjIbj7JtQQ4cubG08g/LrC1CBNIFegF1AnUW+3sYH4E7dn8P2gfnPCnBMJ3Fe0/3L731z3RH9huLNyP0DhxOBS+s8k4up8JacsfvhrO4jtaf6ZwNZPvei+DtV3g0o03Suef7Kj+BLWsF4k6eLBT7nRTZfZFysc1EWopyvfsHxP5Nj744bBAAA",
+  "Body": "H4sIAAAAAAAAAMWTwW6DMAyG38VnaGgooeW6SVN32GHqLpt2CGBa1kCiJFRDVd99oVDaSpvUy7ab5di/P1v595DxOkMhMIek4MKgBzmKcoe6XbUKIQHeWFlx6wrOTy9aQPL23iVMqTFflRUayysFyR7KOtNYYW0hqRshPLDu9RTnTqmPDx7gp+q6x8kFLy9BShcCi5GFYcTjgNEim82Rh7MizWJHI8p6axzHHjYaC1e7sVaZhJBMyCb3c9xNKlmvZZ5OMlkRrkrCreCG7ChZa9koQzp1ivP0Uj2nFJ1EYyxqQ1KebRv17NaTGo0fhYshRXSfe5Rpr/MDpUZ3KzAoCjh4/4Rqaq7MRtoBlMbxFShDHEGvwK6gTiJ/v8YNcEP377DdMP+oAAdnidOZluPv/f7clus12rue+4l3FoHr1anPgtlYeY9KyLbz1dJiNTQcN/A/6KytxFj50LGcxwcxi+ZsyqY0ClhYULag0JtysCzQgEZ+EPp0vgqihLIkjF/h8AVLwH93HAQAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/restoreJobs",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "396"
+      "394"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:57:24 GMT"
+      "Fri, 28 Mar 2025 05:27:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "256"
+      "267"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_2.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_2.json
similarity index 56%
rename from test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_2.json
rename to test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_2.json
index 26a1814b3d..4683f952e3 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_2.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_restoreJobs_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTzW7CMAzH38XnltCwNpA32I4Tu2zaIW0cqEiTKEnZEOq7L4zCQNokLtuUi+WPv3+24j00wjSoNUrgSuiAGUjU7Rb9brlzCBykfTPaCglfkSevgb+8Hhyh9SiXbYchis4B30NrGo8dmgjc9FpnEFP0ZEsRR3vIAN/dofrcWIn2kqNNJlQM72ZUlgvGaspYpZhIT6pEo1uzCYljD2uPKuWuY3SBE9Jo28tc4nbSWbOysp40tiPCtURELQLZUrLytneBHNSTOBOyFlVZzMS8KRWjKkn0IaIPpBbNpnePaTzrMeS0oKOL+KPvwdZHnR8oPaZdQUCtYMj+CTUY4cLaxhG0oPNL0EUl8Ax6BXYFdRL5+zFugBurf4fthv6fCjCkkzit6f78e79fd/y6GaBTWubTWU6rZVHxsuLTxTMMH/DquR+cAwAA",
+  "Body": "H4sIAAAAAAAAAMWTTU/DMAyG/4vP7dKlXyP/AI5oXEAc0sbdoqVJlKSDaep/J2PdlwQSF+Bm2fHrx6/iPbRct6gUCmAdVx4TEKjkFt1uubMIDIR508pwAZfKk1PAXl4PCS8diqXs0QfeW2B7kLp12KMOwPSgVAIhVk+x4GGKxwTw3R66z4M7Lq85ZAyhqrHKi6IoF9W8mtMyq/KumGMWaZTUGx859rB22MW36xCsZ4S0ygwiFbid9UavjGhmrekJt5LwoLgnW0pWzgzWk4M6xUVTZxXt2mKBPC8EpRglBh/QedLwdjPYx7iecejTMr+bUsQdcw+mOep8Q+kwegUeVQdj8k+oXnPr1yZMoLSur1W6CvEMegN2A3US+fs1fgA3df8O2w/mfyrAGE/iZNP9+fd+bXe43AzQjJZplqd0scxKRiuW188wfgBgNCKZnAMAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/restoreJobs",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "336"
+      "337"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 17:01:09 GMT"
+      "Fri, 28 Mar 2025 05:31:48 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "153"
+      "126"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_1.json
index 02501100f1..bde7435cba 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e62e8b7062fc48ea34d22e_clusters_backupRestores-539_backup_snapshots_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SPW/CMBD9L54THAyJIVurLl06AFOrDhf7EiyS2LUd1BTx33uIjwqpXTv63d177+75wJR14wobY/vAyrf3hGkMyhsXCWElixhiGnpwYWsjSxh+OuMxPESqiUzkaTZLhdxMizKfl1n2Si21x48BezVuRofUZnuNHfSaSkbTu5A4n03FYillJaQsaglyWQBSvTX97mTjwLYea+rdxuhCyblq7aBTjftJZ/vG6mqibMfBGQ6xhcD3gjfeDi7wE7vQuQRdQZFPZ7BQeS1FTRRDiOgDr0DtBreixSxtkoqpuED8uueZ5Q+PHlsyFrCt2TH5Z6M3+Tu5O6nLNDtSlM62Ro3PEbtLth4dIbDG+ALdKZtfJa5nuOX3dM0vRIgDcTEKeMAzYj00uDZf+DjSZ2FllrB4HvxRY8dvjoEG8GkCAAA=",
+  "Body": "H4sIAAAAAAAAAL1Sy07DMBD8lz0ndeS0SZsbiAsXDm1PIA6uvUmtJrbxoyJU/Xe26gOQ4MrRs7szszs+gLRuXGKnrQnQvLxmoDBIr10kBBqIGGIejHBhayNkgO9Oewx3kWq84LO8KHO+WBezhk+bon6mltbjW0Ijx/XokNqsUTgIo6ikFb2rGquS13VdVLyV0zmKctpWiFTvtdmdbBxg67Gl3m2MLjSMyd4mlSvcTwZrOqs2E2kHJpxmIvYisD1nnbfJBXZi5zjffGdXnCNRpBDRB7YRcpfckhaztEk+KxcXiF33PLP84dFjT8YC9i0cs382epP/IfdD6jINR4rS2V7L8THicMnWoyNErDA+ieGUza8S1zPc8nu45heiiIm4gAJOeEasFx2u9Afej/RZoCkyiOfBLzU4fgImdK2caQIAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/67e62e8b7062fc48ea34d22e/clusters/backupRestores-539/backup/snapshots",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "329"
+      "322"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:00 GMT"
+      "Fri, 28 Mar 2025 05:24:07 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "113"
+      "120"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e6307658616125063f2692_clusters_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e6307658616125063f2692_clusters_1.json
new file mode 100644
index 0000000000..ba16b97652
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e6307658616125063f2692_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV227bOBD9lQWfE+viWHb1pthq4IUvgaU02yyKgJLGNhuKFEjKhRv433doKqmdtsC+tH0wIM/1kDPn8JnQakdFCdVYijXbtIoaJgWJn0nZaiPrZQNCaz5mzRaUi8m5DkIS//vpgtRMsLqtU0ELDhU6bpU0spScxCSfZcFjSC6I4fo0fS4rQPckfZ/czXJyuCAFLZ/apitCYqNaQCPDcAGlkcqigRfvmnKNbgW0ulWwBgWIHutpKKWoqNrbiiVH8KDyfWNdq/R2Nh0nWZojmtJVxUNmRjGx0VjdZmBBAxP8YULoh4NLv38ZjnJ/EAeDuP/uAVMrpp8y9hVurknc93u+s9xThdfwcqz3d7PZx8f7ZDVPJ5iC4NS+sd0SswJt8H52rAI8ElksFylGbLgsKB87wBnw9ZwKuoEq21JVYd3XE2+UbJsp3gCJhhD1/WE0GEVBFIQDP+qvw+idvWt24i+GfhSuy6sR0P4VjEaAfk4L4NoNjzPxZD+fyRYvEvO2xjQ69rySy7a6rGDXq6XYyKrolbL2aMM8ajjV3i70jmC09zMkXjcA7bnZ2qNLBTq8jPwrYqfHjyPja5zW7+7f2TzljH/LQr9COoNw1v40+s9h1oI2eivN/0H8LfZgqWo9k+s5/SzVB+xyZDkZ9Xzy6jsz9yJ0CFrbpf7xEBva6hNGNsy8obCChrPyKChZA6XbtdMNpecbOixsy7Y+rj5GB7bEBrOdcLh8ZAffG1bqriRWFNpYCbPUxNrzwO+4Ol3eZpapPjIVCv1B8raGThOyPFlMkpXlqEDmjmUrDIl9VALaGpmVlB+5hzIo66a1qvC9BjUKKoZSsoP0jUdjPkzkF3HuODhcVj/eVjugDzgKkzX+iqP1DxYwk4qZPYmH9o+TooWbcXKfESerS8H3v+py3Ty7lnfZY5pk+WNwXNCvUsD058sx6hMX0yU/4OdfLlNJacagTNd9mq1uVstl/k+AGYjevKSMV2mSTxc39k0CK9rH1bRPlnsQ3k5x5/iwwrlQDdke2VljmVmekcN/DlBhzjkHAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e6307658616125063f2692/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "797"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:38 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "521"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/memory.json b/test/e2e/.snapshots/TestRestores/memory.json
index 62047c61f6..cb1f080024 100644
--- a/test/e2e/.snapshots/TestRestores/memory.json
+++ b/test/e2e/.snapshots/TestRestores/memory.json
@@ -1 +1 @@
-{"backupRestores2GenerateClusterName":"backupRestores2-73","backupRestoresGenerateClusterName":"backupRestores-212"}
\ No newline at end of file
+{"backupRestores2GenerateClusterName":"backupRestores2-604","backupRestoresGenerateClusterName":"backupRestores-539"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json b/test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
similarity index 58%
rename from test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
rename to test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
index 5fac573180..b8b57fa8d3 100644
--- a/test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
+++ b/test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJhdXRvRXhwb3J0RW5hYmxlZCI6ZmFsc2UsImNsdXN0ZXJJZCI6IjY3ZTQyZDVhYWRiYTY1MTNhOGM1ZjdiNiIsImNsdXN0ZXJOYW1lIjoiYmFja3VwU2NoZWR1bGUtOTgyIiwiY29weVNldHRpbmdzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTQyZDU2YWRiYTY1MTNhOGM1ZjZhZS9jbHVzdGVycy9iYWNrdXBTY2hlZHVsZS05ODIvYmFja3VwL3NjaGVkdWxlIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9wdWJsaWMvdjEuMC9ncm91cHMvNjdlNDJkNTZhZGJhNjUxM2E4YzVmNmFlIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9ncm91cCJ9XSwicG9saWNpZXMiOlt7ImlkIjoiNjdlNDJlZmY5MWNiYmUwZWY5NDk3MjI0IiwicG9saWN5SXRlbXMiOltdfV0sInJlZmVyZW5jZUhvdXJPZkRheSI6MTYsInJlZmVyZW5jZU1pbnV0ZU9mSG91ciI6NDQsInJlc3RvcmVXaW5kb3dEYXlzIjo3LCJ1c2VPcmdBbmRHcm91cE5hbWVzSW5FeHBvcnRQcmVmaXgiOnRydWV9",
+  "Body": "eyJhdXRvRXhwb3J0RW5hYmxlZCI6ZmFsc2UsImNsdXN0ZXJJZCI6IjY3ZTYyZTg3NTg2MTYxMjUwNjNmMGU5OSIsImNsdXN0ZXJOYW1lIjoiYmFja3VwU2NoZWR1bGUtOTE1IiwiY29weVNldHRpbmdzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTYyZTg0NTg2MTYxMjUwNjNmMGQyMy9jbHVzdGVycy9iYWNrdXBTY2hlZHVsZS05MTUvYmFja3VwL3NjaGVkdWxlIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9wdWJsaWMvdjEuMC9ncm91cHMvNjdlNjJlODQ1ODYxNjEyNTA2M2YwZDIzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9ncm91cCJ9XSwicG9saWNpZXMiOlt7ImlkIjoiNjdlNjMwOGJkZTFjNmU0NWEyYTEyMWRhIiwicG9saWN5SXRlbXMiOltdfV0sInJlZmVyZW5jZUhvdXJPZkRheSI6NSwicmVmZXJlbmNlTWludXRlT2ZIb3VyIjoxNSwicmVzdG9yZVdpbmRvd0RheXMiOjcsInVzZU9yZ0FuZEdyb3VwTmFtZXNJbkV4cG9ydFByZWZpeCI6dHJ1ZX0=",
   "Status": 200,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982/backup/schedule",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d23/clusters/backupSchedule-915/backup/schedule",
   "Headers": {
     "Content-Length": [
-      "579"
+      "578"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-08-05+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:25 GMT"
+      "Fri, 28 Mar 2025 05:16:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "105"
+      "89"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_1.json
deleted file mode 100644
index eb688c30be..0000000000
--- a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/TMBT9K8jPW9MP1o28hTZMRf2Y6ozBEJqc+LY1c+zIdorK1P/OdZyNdjCJF+ChUurre+6x7z3HD4TxLVMF8JFWK7GuDXNCKxI/kKK2TpeLCpS1ciSqDZiwJ5O21yfx5y8npBRKlHWZKpZL4Bi4MtrpQksSk2xKe3d9ckKctIfpM80Bw+P0XXI9zcj+hOSsuK+rFoTEztSAiwK3KyicNp4NPEZXTFoMG2D8ysAKDCB7xLNQaMWZ2XnEQiJ5MNmu8qFlejWdjBKaZsimCKh4SOqMUGuL6D4DAR2M8YcJ/W7/7LQ7OO0Ps94wHpzHr4e3mMqFvafiO1y+JfGg2+mGlRtm8Boej/Xuejr9dHeTLGfpGFOQnNlVvlrilmAd3s9WcMAjkflinuKOtdQ5k6NAmIJczZhia+B0wwxH3KcTr42uqwneABmew+s+PxsynrPhWW/ALoqz1ZABoomDODuKn+dDjEuWg7SheVKoe//5QDZ4kZi3ca6ycRQVUtf8lMO2U2q11jzvFLqMWCUi5iSz0bYfNWRs9BKTqG2AjUJvabEBXks4fXPhJ8KAbDomV9isf1y+XYoMdkMbeK9z+8ToiMFR9cPd/42yVayyG+3+hPDPvXuvUx8Zv52xr9p8wCKNxMlFp0ueYkfLHT8ripV+on/bwYrV9kCNlXDP5GugkqJozIRWUIQ5O5zON8fTyQa+Yl02Y4+7ex5ijdnBNEI+KkPunChsC4mIyjpvX16WiD3rdVudThZX1Ku0iyqF3H7Qsi6h9QOaJfNxsvT6VKjaka6VI3EXXYDVTtOCyUZ3aIG6rGrvCL/6T2WAC7SRLaTPIhbzYay/qePAPvDy3vEcbY8xkGhKfvFvHG2w94SFNsLtSHzu/wQbmocWJzeUBEtdKLn7W5cb+tmWvKZ3aUKzu14zn9+1gsnL1tVYm9/TJt/i56uQabR2IzCurT6hy8vlYpF97GEGsnePKaNlmmST+aV/j9i6dUDUG1p3M6T+4QrPwvN+boMwltghZoHuUKUlAk4zSvY/APG8HWk/BwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "795"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:46 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "72"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_2.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_2.json
deleted file mode 100644
index 168d6e53ad..0000000000
--- a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVbY/aOBD+Kyd/6JdbyAtd2EZanSjQihMsK5zt3rU6rZxkAO86dmQ7VHTFf79xHFrY21ZVpfYkkBLPzDOTeWYePxJWbJnMoRgpueLrWjPLlSTJI8lrY1W5qEAaI0a82oD2PqkwUUySD/+ckZJLXtblRLJMQIGGa62sypUgCUlnNLqLyRmxwhyHz1UBaB5P3gxvZinZn5GM5Q911YKQxOoa8JCju4TcKu2qgYN1xYRBswZWXGtYgQasHvEM5EoWTO8cYi6weNDprnKm5eR6Nh0N6STFanKPih9JreZybRy6sczFIjwplVyrIkuCwJdl8g0UtYDOq4u4Yzbo1AlD/HVDveabbuveKWDblWCTeBBGg7NvhkY/Hhp/KzT4A4m6dN17wWq7oarWOVyyAkl6oaESPGcU7CWzgplOdl9U99UBGvtyaAHV2y9d+N3o7bOdeL6OpvXIjIUx/hEmDuPzTtjrxP006ie9QfKy/x5zFdw8UP4J3r4mSQ876U9umcZSD/Px5mY2+/vudricT8YYgizrXeVoG9olGIuDtuUF4GyQq8XVBD3WQmVMjDzzFMRqziRbQ0HdJyLu59FZa1VXU8d1fwAv4+K8z4qM9c+jHrvIz1d9BojGj+zsxD7I+mgXLANh/BYILh/c4yPZ4ERi3MbaymDfcqHqomlO26hursqAVTxoSAi2cdAUY4KvVRK0k2xaDugRB8RtgWhGX6yw9b84fXsUaGRDafhTZeZzRScVnGQ/9v7fSjaSVWaj7PcU/MV37wTPWcav5+xe6XeYpNFKctF1G9TaTo67blYkK91EP8tgxWpzJGsVt090sN3cRrAqyP2cHU/nq9PpZD2XsS6bsUfvyEGsMdqrr4/HzRA7y3PTQiKidAKQg1tLxJ5HYbun08U1dVsa4pZCZt4pUZfQCitNh1fj4dLtp8StHalaWpKEqAIoQIrmTDR7h3eJKqvaKcJ/hbzSUHDU4y1MnlgMxsNYfZSnhr2vy2nHU7Q92kCgurvDn/Fpvb0rmCvN7Y4kA/fiZejKUzy8pcTfTQspdj+ruZ7PNuUNvZsMaXoXNfP5SUmYfl26GmlzPm3we3z8zUdqpewItG2zT+ny7XKxSP+K/N1gDyHT8cyprWXrVv1w11C2mwF1t7+/W59yufVLsUR2mAG6ww0tEWyWUrL/FxEYAkGECAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "900"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:24 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_1.json
new file mode 100644
index 0000000000..7f50189282
--- /dev/null
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV227bOBD9lQWfE+vi+hK9qbYaeOFLYCrNNosioKWxzYYiBZJy4Qb+9w5NJWunG6AvbR8MyDycmUPOnMMnwsodkwWUIyXXfNNoZrmSJHkiRWOsqhY1SGPEiNdb0H5PLkwUk+Tfzxek4pJXTZVJthJQInCjlVWFEiQh+ZRGDzG5IFaY0/CZKgHhcfYhvZ3m5HBBVqx4bOo2CUmsbgAXOW6XUFilHRt4RtdMGIQ1sPJGwxo0IHvMZ6BQsmR67zIWAsmDzve1g5bZzXQySmmWI5vCZ8VDUqu53BjM7iIwoYUx/jAgDuPeZdi9jId52EvCQRJd3WNoyc0j5d/g+j1JumEn9Ct3TOM1PB/rw+10+unhLl3OsjGGIDm9r1211C7BWLyfHS8Bj0Tmi3mGOzZCrZgYecIUxHrGJNtASbdMl5j35cQbrZp6gjdA+gPoxzB81xv2o34U98J+dx2WcRez8RN8cIbD1RXigq1AGN88weWj+3wiW7xIjNtaW5skCAqhmvKyhF2nUnKjylWnUFXAah4wK5gJdnFwJGOCt5gEbQNM4HtLiy2UjYDLq6hHXPPEsWNijc36zeXbpUBjN5SGv9XKvDA6Y3BW/XT3H6NsJKvNVtmfIfzf3oPTqUPG72fsi9IfschR4mTYCckLdrbc6SMgWeUm+n87WLPGnKix5vaVfDXUghdHM6E1FH7OTqezfz6dg5Wr2FTHscfdkUuxwWhvGj4elSH2lhemTYkZpbHOvpwsMfcsCludThY31Kk0RJXCynxUoqmg9QOap/NxunT6lKjakWqkJUmILsAaq2jBxFF3aIGqqhvnCD/6T62h5GgjO8heIQbjYay+ynPg4Hk573id7YAYCDQlt/grjtY9OMJcaW73JBm4P96G5r7F6R0l3lIXUux/1eX6frYlb+lDltL8ITrO5zclYfK2dQ3dyLk9bfA9fv7lI7VSdgTattUndHm9XCzyfyKMQPb2OWS0zNJ8Mr927xHbtA6IekPrPg6pe7j8s/C6nzsvjCV2iBmge1RphQmnOSWH78AYaLQ/BwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d23/clusters/backupSchedule-915",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "798"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "78"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_2.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_2.json
new file mode 100644
index 0000000000..e2422167b1
--- /dev/null
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVbW/bNhD+KwM/9Mti68XzSwQEhWu7hQc7Dkyl2VoMASWdZTYUqZKUBzfwf99Rkls7S4uiQDfABiTe3XOne+4ePhKW7ZhMIZsoueF5pZnlSpLokaSVsapYlSCNERNebkE3PrEwQUii939dkIJLXlTFTLJEQIaGG62sSpUgEYkXNLgPyQWxwpyGL1UGaJ7OXo9vFzE5XJCEpQ9V2YKQyOoK8JCju4TUKu2qgaN1w4RBswaW3WjYgAasHvEMpEpmTO8dYiqweNDxvnSm9exmMZ+M6SzGatIGFT+SWs1lbhy6sczFIjwplMxVlkSe15Rl0i1klYDOZdDvmC06dXwff90s33x86LbunQx2XQk2Cod+MLz4Zmjw46Hht0K9l0jUleveC1bZLVWVTuGKZUjSCw2l4CmjYK+YFcx0Uj78kOyP0NiXYwuo3n3pwq9G757txPN11K1HZixM8Y8woR/2O36vE45ivx/5wyi4fIe5Mm4eKP8Eb16RqOd3/ebkjmks9Tgfr28Xiz/v78br5WyKIciy3peOtrFdg7E4aDueAc4GuV5dz9AjFyphYtIwT0FslkyyHDLqPhFxP49OrlVVzh3XgyEMQhj91h8NgkEQ9v1Bb+NnYQ/R+Il9eGaHy0u0C5aAMM0WCC4f3OMj2eJEYtzW2tJg31KhqqxuTtuobqoKj5Xcq0nwdqFXF2O8r1XitZNsWg7oCQfEbYGoR19ssPX/cfr2yNPIhtLwu0rM54rOKjjLfur9v5VsJCvNVtnvKfiL78EJnrNMXy3ZB6XfYpJaK8mo6zaotZ0ddwdokKxwE/0sgyWrzImsldw+0cF2c2vBKiFt5ux0Ogfn0zlMXMaqqMcevQMHkWN0o75NPG6G2FuemhYSEaUTgBTcWiL2MvDbPZ2vbqjbUh+3FBLzVomqgFZYaTy+no7Xbj8lbu1EVdKSyEcVQAFSNGWi3ju8S1RRVk4R/i3kpYaMox7vYPbEYjAepupveW44NHU57XiKdkAbCFR3d/gzPq13cAVzpbndk2joXhoZum4oHt9R0txNKyn2P6u5DZ9tylt6PxvT+D6o5/OTkjD/unSN3Mg5nzb4HT7+0kRqpewEtG2zz+n6zXq1iv8ImrvBHkPm04VTW8vyVv1w11C26wF1t39ztz7lctcsxRrZYQboHje0QLBFTMnhH2ek84uECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d23/clusters/backupSchedule-915",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "903"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:29 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "71"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
similarity index 53%
rename from test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
rename to test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
index f69823a268..dcedd01e49 100644
--- a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAKWUTY/aMBCG/4vPAYM3H5BbpV21HFoqsW2lVntw4gmxMHYa2yzRiv/eMaR0Edmiqjfr9cw8r2dsvxDunXnYN6Z1D5oXCgTJK64sRKRU3jpoF6iQNIOYiYRzUfA0md7xWZlUWZGSc9gnvgUMLHi58c2qrEF4BaP5jIUQ03QrcE7qtSX5j6eIKKk3YflC6hYqzKuda2xOaamMFyMBu/HW6LURxbg0W8obSblT3NIdo+vW+MbS3lJ6YSnlQHtDll576SVqew29taAQb0FV5BD9g53GF0qWdDcdT245OlMuql5UPFYgB+yMhr1bad7Y2jhMYROWjCZ3I5Y+MpbHcR7PvmO9xiBcwqmF8jwhqKr5tCwKmEA1j+cZY/Hv4G7hYHuKr1r46UGjpLFPO47W0uiP+tg1YZK18a3qMP1v5ZPj2RxoJ43+omWwLHhnX8tfufJYMAvtHUBPr9GCy5vk9P/JA4d+BtjcRGcD6JA4xI7fYMeTazheCFffpM8G6MfMIfyUvdV1ds3vgN+e+HwAHxIH6YencKXxSUGLHPiAV2pZ3fMOt9JX+kepvYNlFfaxNXHYss608E1qYZ7vw1jzLCLewrJdv9PifXgu4cexC336vD5jMbnv/67DL9fxcGDXBAAA",
+  "Body": "H4sIAAAAAAAAAKWUUW/bIBDHvwvPTjAkdhK/TWq15WHLpHSb1KkP2JxjFAKegTRWle8+SNyuUdxZVd/Qcff//bkDnhBzVt8eat3YW8VyCRxlJZMGIlRIZyw0Sx9B6QxSCvNZMk9JSmgSp5MyhsUCvaR9YzvwiTkrtq5eFxVwJ2G0IElI0XW7BmuF2hiU/X6IkBRqG5ZPqGqg9HWVtbXJMC6kdnzEYT/eabXRPB8XeodZLTCzkhm8p3jTaFcb3FmaXljidII7QwZfe+lC2HQx760B6fEGZImO0Tvs1C6XosB7Mo6HHL1QLlQvFE8K6Og7o+Bg14rVptLWl9CYJqN4MqLzO0IykmRJeu/1au3hAs4tFM8TmsTznAMpUpgmjDJCCWfPye3Swu6cXzbwx4HyIeX7tGfeWhr9i961dZhkpV0jW1/+P/n8dDYLygqtfigRLHPWmtfhn0w6LzgL7e1Bk2s0Z2KQXHyc3HPoR4DtIJr3oENhH3v6BnsaX8P9hbDVIB166KfKPjyhb3WdXvNbYMMTL3vwobCXfnwIV9o/KWg8B774K7Uqb1iLsuRV+KtQzsKqDNu+6LRlrG7gl1BcP96EqWazCDkDq2bzSfHP4bWED8cs1fnv+u7FxKH7uo5/AaAzjJPWBAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982/backup/schedule",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d23/clusters/backupSchedule-915/backup/schedule",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:24 GMT"
+      "Fri, 28 Mar 2025 05:16:29 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "46"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_provider_regions_1.json
index 80f5f64290..be908eb729 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUUWvCMBCA/0sefHKLrc6wQhlFOjZQJ7biYIhEe+3C0qYkqQ8b/vfFiqjbaLPHXL7cfckl+UKcFR8KeW9f6F1Cijz0rnWpPIy3XFTJTQK721wUmUg2t1uRY1oyTDWnCu9cnElRlQoPCQzc5H54T8jGJWSYEkruyKBvUlRKg1S4lGLHEpBYQsZEoR5YYeYSGImq0L6WFXROiPKDZdTRDKQ/cXqdkmYwrXLf6TANuZqBnJmI7/R6qIskcCOsgKdovzoMVcX1cTOsUJoWW4jYJxwjdEcZpxsO86NDHUwgpWYN8g4OXVTQHEzGRbQOgyheO2jfvWBSytVvyG2BluHvTD+r1UxjolGwHoXTeB6Mm63CxXr6Mo+fWqm/tP6GGr1OUL8FspU/cY1Fo8CiP8HMDopeFvFTeyevyMbdXpGDFrJulpXnmWzzPJP2nlanZEk1+k1Cu7tgOJuajzaUuVf/oRr9n8d2/ubBtj+xqxbcWZOk8eBeLwVX57jTq4enj/aQdBnVIS005fVfjDxn/w2PTPUqFAYAAA==",
+  "Body": "H4sIAAAAAAAAAJWUXWuDMBRA/0se+tQ1alc3BBlSHB30i9rSwRiS1asNi0aS2IeN/velFum6Dc0ec3Ny70lukk/EaPEukffyifYCUuShvVKl9DDeMV4lNwkcBjkvMp68DXY8x6SkmChGJD44OBO8KiV278B14P52dO/aru2MLHeYWokz1CkqqUBIXAp+oAkILCCjvJAPtNBzCYx5VShfiQp6DSL9YBv1FAXhz2yrV5IM5lXu2z2qIJdLEEsd8W3LQn0kgGlhCSxFx9fTUFZMnTdDC6lIsYOIfsA5Qg6EMvLGYHV2qIMJpESvQd7JoY8KkoPOuIniMIjWsY2O/W9MSpj8DTkd0Db8nelntZppTTQO4nE4X6+CabtVuInni9V60kn9pfU31OrVQMMOyFS+4VqLRoFBf4KlGRQtNutJdyevyNbdXpG3HWTdLCPPC9nleSHNPY1OyZBq9ZuFZndBcyY1H00ofa/+Q7X6P03N/PWD7X5iVy0YGZN3rQf3/F3w9RK3rXrYfLSnpNuoDimuCKv/YuTZxy/eFXG7FAYAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d23/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:49 GMT"
+      "Fri, 28 Mar 2025 05:07:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "71"
+      "66"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index daaff02c21..222db5d581 100644
--- a/test/e2e/.snapshots/TestSchedule/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:45 GMT"
+      "Fri, 28 Mar 2025 05:07:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json b/test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
rename to test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
index c9670ad05a..78f9c18b72 100644
--- a/test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
+++ b/test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_backupSchedule-915_backup_schedule_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJhdXRvRXhwb3J0RW5hYmxlZCI6ZmFsc2UsImNsdXN0ZXJJZCI6IjY3ZTQyZDVhYWRiYTY1MTNhOGM1ZjdiNiIsImNsdXN0ZXJOYW1lIjoiYmFja3VwU2NoZWR1bGUtOTgyIiwiY29weVNldHRpbmdzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTQyZDU2YWRiYTY1MTNhOGM1ZjZhZS9jbHVzdGVycy9iYWNrdXBTY2hlZHVsZS05ODIvYmFja3VwL3NjaGVkdWxlIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9wdWJsaWMvdjEuMC9ncm91cHMvNjdlNDJkNTZhZGJhNjUxM2E4YzVmNmFlIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9ncm91cCJ9XSwibmV4dFNuYXBzaG90IjoiMjAyNS0wMy0yNlQyMjo0NDo0OFoiLCJwb2xpY2llcyI6W3siaWQiOiI2N2U0MmVmZjkxY2JiZTBlZjk0OTcyMjQiLCJwb2xpY3lJdGVtcyI6W3siZnJlcXVlbmN5SW50ZXJ2YWwiOjYsImZyZXF1ZW5jeVR5cGUiOiJob3VybHkiLCJpZCI6IjY3ZTQyZWZmOTFjYmJlMGVmOTQ5NzIyNSIsInJldGVudGlvblVuaXQiOiJkYXlzIiwicmV0ZW50aW9uVmFsdWUiOjd9LHsiZnJlcXVlbmN5SW50ZXJ2YWwiOjEsImZyZXF1ZW5jeVR5cGUiOiJkYWlseSIsImlkIjoiNjdlNDJlZmY5MWNiYmUwZWY5NDk3MjI2IiwicmV0ZW50aW9uVW5pdCI6ImRheXMiLCJyZXRlbnRpb25WYWx1ZSI6N30seyJmcmVxdWVuY3lJbnRlcnZhbCI6NiwiZnJlcXVlbmN5VHlwZSI6IndlZWtseSIsImlkIjoiNjdlNDJlZmY5MWNiYmUwZWY5NDk3MjI3IiwicmV0ZW50aW9uVW5pdCI6IndlZWtzIiwicmV0ZW50aW9uVmFsdWUiOjR9LHsiZnJlcXVlbmN5SW50ZXJ2YWwiOjQwLCJmcmVxdWVuY3lUeXBlIjoibW9udGhseSIsImlkIjoiNjdlNDJlZmY5MWNiYmUwZWY5NDk3MjI4IiwicmV0ZW50aW9uVW5pdCI6Im1vbnRocyIsInJldGVudGlvblZhbHVlIjoxMn0seyJmcmVxdWVuY3lJbnRlcnZhbCI6MTIsImZyZXF1ZW5jeVR5cGUiOiJ5ZWFybHkiLCJpZCI6IjY3ZTQyZWZmOTFjYmJlMGVmOTQ5NzIyOSIsInJldGVudGlvblVuaXQiOiJ5ZWFycyIsInJldGVudGlvblZhbHVlIjoxfV19XSwicmVmZXJlbmNlSG91ck9mRGF5IjoxNiwicmVmZXJlbmNlTWludXRlT2ZIb3VyIjo0NCwicmVzdG9yZVdpbmRvd0RheXMiOjcsInVzZU9yZ0FuZEdyb3VwTmFtZXNJbkV4cG9ydFByZWZpeCI6dHJ1ZX0=",
+  "Body": "eyJhdXRvRXhwb3J0RW5hYmxlZCI6ZmFsc2UsImNsdXN0ZXJJZCI6IjY3ZTYyZTg3NTg2MTYxMjUwNjNmMGU5OSIsImNsdXN0ZXJOYW1lIjoiYmFja3VwU2NoZWR1bGUtOTE1IiwiY29weVNldHRpbmdzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTYyZTg0NTg2MTYxMjUwNjNmMGQyMy9jbHVzdGVycy9iYWNrdXBTY2hlZHVsZS05MTUvYmFja3VwL3NjaGVkdWxlIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9wdWJsaWMvdjEuMC9ncm91cHMvNjdlNjJlODQ1ODYxNjEyNTA2M2YwZDIzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9ncm91cCJ9XSwibmV4dFNuYXBzaG90IjoiMjAyNS0wMy0yOFQxMToxNTo1NloiLCJwb2xpY2llcyI6W3siaWQiOiI2N2U2MzA4YmRlMWM2ZTQ1YTJhMTIxZGEiLCJwb2xpY3lJdGVtcyI6W3siZnJlcXVlbmN5SW50ZXJ2YWwiOjYsImZyZXF1ZW5jeVR5cGUiOiJob3VybHkiLCJpZCI6IjY3ZTYzMDhiZGUxYzZlNDVhMmExMjFkYiIsInJldGVudGlvblVuaXQiOiJkYXlzIiwicmV0ZW50aW9uVmFsdWUiOjd9LHsiZnJlcXVlbmN5SW50ZXJ2YWwiOjEsImZyZXF1ZW5jeVR5cGUiOiJkYWlseSIsImlkIjoiNjdlNjMwOGJkZTFjNmU0NWEyYTEyMWRjIiwicmV0ZW50aW9uVW5pdCI6ImRheXMiLCJyZXRlbnRpb25WYWx1ZSI6N30seyJmcmVxdWVuY3lJbnRlcnZhbCI6NiwiZnJlcXVlbmN5VHlwZSI6IndlZWtseSIsImlkIjoiNjdlNjMwOGJkZTFjNmU0NWEyYTEyMWRkIiwicmV0ZW50aW9uVW5pdCI6IndlZWtzIiwicmV0ZW50aW9uVmFsdWUiOjR9LHsiZnJlcXVlbmN5SW50ZXJ2YWwiOjQwLCJmcmVxdWVuY3lUeXBlIjoibW9udGhseSIsImlkIjoiNjdlNjMwOGJkZTFjNmU0NWEyYTEyMWRlIiwicmV0ZW50aW9uVW5pdCI6Im1vbnRocyIsInJldGVudGlvblZhbHVlIjoxMn0seyJmcmVxdWVuY3lJbnRlcnZhbCI6MTIsImZyZXF1ZW5jeVR5cGUiOiJ5ZWFybHkiLCJpZCI6IjY3ZTYzMDhiZGUxYzZlNDVhMmExMjFkZiIsInJldGVudGlvblVuaXQiOiJ5ZWFycyIsInJldGVudGlvblZhbHVlIjoxfV19XSwicmVmZXJlbmNlSG91ck9mRGF5Ijo1LCJyZWZlcmVuY2VNaW51dGVPZkhvdXIiOjE1LCJyZXN0b3JlV2luZG93RGF5cyI6NywidXNlT3JnQW5kR3JvdXBOYW1lc0luRXhwb3J0UHJlZml4Ijp0cnVlfQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982/backup/schedule",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d23/clusters/backupSchedule-915/backup/schedule",
   "Headers": {
     "Content-Length": [
-      "1238"
+      "1237"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:25 GMT"
+      "Fri, 28 Mar 2025 05:16:29 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "191"
+      "141"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_1.json
index fb9a3e68ed..5abef9320f 100644
--- a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGDAINZOndsurTocvgOsGIxskw4R/16iqGlZKhbme3r3pNNdmTKzD+Se7DwGVicRU44gELKaiUQUcZLFQr6mss7KOi/eWcT0bSZLygUWErABWaQZVKpoJdA6N3o8e1Z/XFnvqF3ZPoTJ15wrY2eMkS6nwY6dxeak7MBh0hyCAc8vgnfOzpPn/9gdmVXpybRsiQ5YwZUdA+iRnH9s29g35j/wQTX38+xq+UGPKUEI0ICnN78vZ8sf0zTRvpY7d1CDs4q8p10dD/aYlq9eBzLahx0tv+zyGbERBlrxBtR5nl5UTzgbiklQnObVarOue779fUEtgqwEZK0gFFQiSoWUs+UbDLmYO0sEAAA=",
+  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniI0Bg1g7dW67tOpg7AOsGBv5Ix0i/nuJoqZlqVg839O7J53uioSOPoB7stEE1JEMCQc8gEQdooTWOSlz2r6SuiNNV7TvKEPqNmMNMAptVbesYAWtCSsHImm5zbUyZ4+6jyuaHAwbO4Ww+A5joW2UuYTLabZmtLI/CTtjvijMg+YeXygenY2Lx//YHehN6UEPaM0SrMDCmsCVAecf23b2nfkPnKjmfp5DLT9omhLJA++5hzd/LGfPp2la4FjLnUvU4KwA7+FQx4NN0/I1qQBa+XCg5ZddPzNk+Awb3nNxjsuLmEBGDTlQyKuq2WzWjc+3v69hkJy1lJcDBUmhkZIJCRVavwGKGBKjSwQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "287"
+      "289"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:42 GMT"
+      "Fri, 28 Mar 2025 05:07:16 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "3152"
+      "1943"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_1.json b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_1.json
deleted file mode 100644
index 819accf933..0000000000
--- a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/TMBT9K8jPW9MP1o28hTZMRf2Y6ozBEJqc+LY1c+zIdorK1P/OdZyNdjCJF+ChUurre+6x7z3HD4TxLVMF8JFWK7GuDXNCKxI/kKK2TpeLCpS1ciSqDZiwJ5O21yfx5y8npBRKlHWZKpZL4Bi4MtrpQksSk2xKe3d9ckKctIfpM80Bw+P0XXI9zcj+hOSsuK+rFoTEztSAiwK3KyicNp4NPEZXTFoMG2D8ysAKDCB7xLNQaMWZ2XnEQiJ5MNmu8qFlejWdjBKaZsimCKh4SOqMUGuL6D4DAR2M8YcJ/W7/7LQ7OO0Ps94wHpzHr4e3mMqFvafiO1y+JfGg2+mGlRtm8Boej/Xuejr9dHeTLGfpGFOQnNlVvlrilmAd3s9WcMAjkflinuKOtdQ5k6NAmIJczZhia+B0wwxH3KcTr42uqwneABmew+s+PxsynrPhWW/ALoqz1ZABoomDODuKn+dDjEuWg7SheVKoe//5QDZ4kZi3ca6ycRQVUtf8lMO2U2q11jzvFLqMWCUi5iSz0bYfNWRs9BKTqG2AjUJvabEBXks4fXPhJ8KAbDomV9isf1y+XYoMdkMbeK9z+8ToiMFR9cPd/42yVayyG+3+hPDPvXuvUx8Zv52xr9p8wCKNxMlFp0ueYkfLHT8ripV+on/bwYrV9kCNlXDP5GugkqJozIRWUIQ5O5zON8fTyQa+Yl02Y4+7ex5ijdnBNEI+KkPunChsC4mIyjpvX16WiD3rdVudThZX1Ku0iyqF3H7Qsi6h9QOaJfNxsvT6VKjaka6VI3EXXYDVTtOCyUZ3aIG6rGrvCL/6T2WAC7SRLaTPIhbzYay/qePAPvDy3vEcbY8xkGhKfvFvHG2w94SFNsLtSHzu/wQbmocWJzeUBEtdKLn7W5cb+tmWvKZ3aUKzu14zn9+1gsnL1tVYm9/TJt/i56uQabR2IzCurT6hy8vlYpF97GEGsnePKaNlmmST+aV/j8AbdjOa/rkKj8HzLm6DHJbYF2aB7lCbJcJMM0r2PwAVRhwxNQcAAA==",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "790"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:45 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "957"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_1.json b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_1.json
new file mode 100644
index 0000000000..aa307a9ec4
--- /dev/null
+++ b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e62e8458616125063f0d23_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV227bOBD9lQWfE+vi+hK9qbYaeOFLYCrNNosioKWxzYYiBZJy4Qb+9w5NJWunG6AvbR8MyDycmUPOnMMnwsodkwWUIyXXfNNoZrmSJHkiRWOsqhY1SGPEiNdb0H5PLkwUk+Tfzxek4pJXTZVJthJQInCjlVWFEiQh+ZRGDzG5IFaY0/CZKgHhcfYhvZ3m5HBBVqx4bOo2CUmsbgAXOW6XUFilHRt4RtdMGIQ1sPJGwxo0IHvMZ6BQsmR67zIWAsmDzve1g5bZzXQySmmWI5vCZ8VDUqu53BjM7iIwoYUx/jAgDuPeZdi9jId52EvCQRJd3WNoyc0j5d/g+j1JumEn9Ct3TOM1PB/rw+10+unhLl3OsjGGIDm9r1211C7BWLyfHS8Bj0Tmi3mGOzZCrZgYecIUxHrGJNtASbdMl5j35cQbrZp6gjdA+gPoxzB81xv2o34U98J+dx2WcRez8RN8cIbD1RXigq1AGN88weWj+3wiW7xIjNtaW5skCAqhmvKyhF2nUnKjylWnUFXAah4wK5gJdnFwJGOCt5gEbQNM4HtLiy2UjYDLq6hHXPPEsWNijc36zeXbpUBjN5SGv9XKvDA6Y3BW/XT3H6NsJKvNVtmfIfzf3oPTqUPG72fsi9IfschR4mTYCckLdrbc6SMgWeUm+n87WLPGnKix5vaVfDXUghdHM6E1FH7OTqezfz6dg5Wr2FTHscfdkUuxwWhvGj4elSH2lhemTYkZpbHOvpwsMfcsCludThY31Kk0RJXCynxUoqmg9QOap/NxunT6lKjakWqkJUmILsAaq2jBxFF3aIGqqhvnCD/6T62h5GgjO8heIQbjYay+ynPg4Hk573id7YAYCDQlt/grjtY9OMJcaW73JBm4P96G5r7F6R0l3lIXUux/1eX6frYlb+lDltL8ITrO5zclYfK2dQ3dyLk9bfA9fv7lI7VSdgTattUndHm9XCzyfyKMQPb2OWS0zNJ8Mr927xE4wz6Opnuu/GPwuos7L4cl9oUZoHvUZoVppjklh+8UzQrtNQcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e8458616125063f0d23/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "793"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:18 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "533"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/memory.json b/test/e2e/.snapshots/TestSchedule/memory.json
index 76e1fe73f4..c93ce7e63a 100644
--- a/test/e2e/.snapshots/TestSchedule/memory.json
+++ b/test/e2e/.snapshots/TestSchedule/memory.json
@@ -1 +1 @@
-{"backupScheduleGenerateClusterName":"backupSchedule-982"}
\ No newline at end of file
+{"backupScheduleGenerateClusterName":"backupSchedule-915"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json b/test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_67e630a47062fc48ea34e9ec_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
rename to test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_67e630a47062fc48ea34e9ec_1.json
index 4ae59287c6..d7a4a6e93a 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
+++ b/test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_67e630a47062fc48ea34e9ec_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes/67e43199adba6513a8c63fb5",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926/fts/indexes/67e630a47062fc48ea34e9ec",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:55:54 GMT"
+      "Fri, 28 Mar 2025 05:16:23 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "66"
+      "61"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_provider_regions_1.json
deleted file mode 100644
index 8fe26c9650..0000000000
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeqdQRpEOB96wioMhEttTDUubkqQ+bPjfFytFndJmjzn5cs6XnCQ/iNHkSyL78wcdBETIRgelUmljHDCehS8hHBsxT/Y83DUCHmOSUkwUIxIfW3gveJZK3OtDpxV2AxLuSK9rtckg6EYDGOgUmVQgJE4FP9IQBBawpzyRrzTRcyEMeZYoR4kMagUiHXft1xQF4UysZi0le5hmsWPVqIJYzkHMdcSxmk1URwKYFpbAInTanIcyY+qyGZpIRZIAfPoNlwg5EsrIjsHi4pAHQ4iIXoPss0MdJSQGnXHlbz3XX24tdKrfMBFh8hFqVUBr7zHT32o5U5po6G6H3nS5cMflVt5qO50tlqNK6pnWc6jUq4DaFZCpfMGVFvVdg/64czPIn62Wo+pO3pGlu70jOxVk3iwjzytZ5XklzT2NTsmQKvWbeGZ3QXMmNd9MKH2v/kOV+r+Pzfz1g61+Ynct6BqT/dKD+7gV3FzjVjMfFh/tOenaz0OKK8LyvxjZ1ukXmOsX6hQGAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "413"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:50 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "136"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_1.json
deleted file mode 100644
index a3d064825d..0000000000
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/bgmBQbt8S4FVTPyoSNpunabK2Ad4dezIdphoxf++M05bYKq0L+0HpJC7e/fsu/fyRChfU8WA97RaiGVlqBNakeSJsMo6XUxLUNbKnihXYEJOLm3cIsnPXyekEEoUVTFQdC6BY+DKaKeZliQh+SiL71vkhDhp98vHmgOG+4Ov6fUoJ9sTMqfsoSprEJIsqLSAbwXmK2BOG08HjsIGKL8ysAADSB8BLTCtODUbD8kksgeTb0ofmg2uRsNemg1ypMMCKp4yc0aopUV0X4GADvr4w4JWs9U5bbZPW9087ibts6QT32EpF/YhE49weUGSdrPRDG9uqcF7eD7X1+vR6Mf9bTobD/pYguTMpvTdUjcD6/CC1oIDHolMppMBZiylnlPZC4QzkIsxVXQJPFtRwxH35cRLo6tyiDdAumfwucU7jPI57XbiNj1nncU5nCOa2IsvDuL0S4xxSecgbZieFOrBPz6RFV4k1q2cK20SRUzqip9yWDcKrZaazxtMFxEtRUSdpDZat6IdGRu9xSSqB2AjC9Sw1emZJ2dA7gYlFzijj+kaheWKDN69NvBNz+0LkYPGB033sz+aqVW0tCvt/ofna+7Wq9FH+hdj+lubG8TeCZmcN5rkJXbwutHFgKJFUM/rmEpa2T2llcIda9NAKQXbWUVWAgtLtL96cLh6He47VcVupzE79hBLrA6WEOpx7eXGCWZrSERU1nlz8ppD7HHcrEU4nF5lXoJNlCDM7Y2WVQG12LM8nfTTmRefQkn2dKUcSZoocVo5nTEqd6JCg9NFWXm5/2supQEu0CPWcHxyi/XQ13/UYWAbeHljOEbbYgwkOo5/+R5Ha289YaGNcBuSnPk/wWMmYbTpbUaCX06V3LzX5YZ51i2vs/tBmuX38W4vH7WC4dvL0fU753Pq4jt8/BQqjdauB8bV3YfZ7HI2nebfvZMhe/dc0psN0nw4ufRfG7qs7Q3lhb68W1L/WQqefzzPdRDEDCdELWQbFGWBgKM8I9u/6K8kRR0HAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "785"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:51 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "78"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_2.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_2.json
deleted file mode 100644
index 402dce972a..0000000000
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VW48aNxT+K5Uf8tKFuVAuGWlVESARFSwrZjbbpKpWxnMY3PXYI9tDRVb89x6PZ7NAkqp9SCSQwMfnO7fvfH4iNN9TySCfKLnlRa2p5UqS5Imw2lhVriqQxogJr3ag/Z1MmCgmyR9/XpGSS17W5UzSjYAcDbdaWcWUIAnJFmn0EJMrYoU5dV+qHNA8nb0d3y0ycrwiG8oe66oFIcmWCgN4yvG+BGaVdunAhVkDzW81bEEDpo+ABpiSOdUHB8kEZg86O1TOtJ7dLuaTcTrLMB3mUbHK1GouC+PQjaXOF+FJqWSh8k0SBAaoZrvOcNQxO7R1whA/3a0qaNltb3Vy2Hcl2CQehtHw6mse0f/2iP/NI/gVx3FtdQ2vaG13qao1g2ua4yheaagEZzQFe02toKazy18beXiGxuKf60z1/qXUn43en5b79fBNW7HrFqb4Re84jPudsNeJB1k0SHrDpB99xBA5N48p/wTv3pCkF3ZDf3JPNWb4PPy3d4vFh4f78Xo5m6ILTlAfKjeSsV2DsciiPc8B505uVjczvFEItaFi4qeagtguqaQF5KmrDHE/06LQqq7mbo6DIfwS531G8w0d9KMeHbH+dgQjROMn9u2Znb6O0C7oBoTxFBdcPrqfT2SHbEO/nbWVwXYxoeq8aU7bqC5TZUArHjS9D/Zx0CRjgm9lErQsNS+tJ47YomGz2GLHf0zUwG9goLH3SsNvamM+J3IW+Czo6e0fnamRtDI7Zf9Lni93j06ynGX6Zkn/Uvo9YjdqR0Zdtx2t7ey4O0CDpKWXmJcxVbQ2J3JUcXspYO02NkpTAfMkOqUenFOvn7tIddlwGm9HDqJAb6+b3h9pLw6WM9NCIqJ0S83A7RxiL6OwXcL56jZ1KxjiCsLGvFeiLqFVxDQb30zHa7d8EldyomppSRLiiqOoqJRR0SwVvgKqrGq37l8qcKUh5yike7is3KA/TNXf8txw9Hk5YbhEO6INBMqyO/wepfWOLmGuNLcHkgzdH68xN3604/uU+EdlJcXhezXXz7MNeZc+zMZp9hA1vPykJMy/TY6B45y70zp/xJ8/eU+tlJ2Atm30ebp+t16tst8jr/f22WU+XTgptbRopQ1XCzW5Iah7t/2jeDnLvV+GNU6HGkgPuJAlgi2ylBz/AWTCWew+CAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "888"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:11 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "94"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_provider_regions_1.json
index d71fba6cb8..ff66c33d99 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeh2FMop0OPCGVRwMkWhONSxtSpL6MPG/L1ZEndJmjzn5cs6XnCQHxFnyrZD7dUA7CRFy0U7rVLkYb7jI6AuFfS0WyVbQdW0jYkxShonmROF9A2+lyFKFO11oNWjHIXRNOm2nSV437WjdoSZFpjRIhVMp9oyCxBK2TCTqjSVmjkJPZIn2tMygckGU5y/CimYgvaFTr6RkC6Ms9pwK0xCrCciJiXhOvY6qSAI3wgp4hI7L01BlXJ83wxKlSbKBkP3AOUL2hHGy5jA9O+RBChExa5B7cqiihMRgMs7DVeCHs5WDjtUbJiJcPUKNEmgRPGb6Wy1nChP1/FUvGM2m/qDYKpivRuPprF9KPdN6DhV6XaBmCWQrf+EKi4a+RX/8iR0Ujuezfnkn78jC3d6RrRIyb5aV55Us87yS9p5Wp2RJFfoNA7u7YDibmu82lLlX/6EK/T8Gdv7mwZY/sbsWtK3JbuHBfd4KLq9xp54PLx/tKekizENaaMLzvxi5zvEXnmj4iRQGAAA=",
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmVadSKKNIhwO/sIqDIRLbWw1Lm5KkPkz874sVUae02WNuTu49yU1yQIym3xI5Xwe0ExAjB+2UyqSDcch4Hr1EsG8kPN3yaNMIeYJJRjFRjEi8b+Kt4HkmcacLnSb02l2r04zDdg9Iqx3GXdApcqlASJwJvqcRCCxgS3kq32iq5yLo8zxVrhI51C6IdL1lUFMUhDuyrVpGtjDOE9euUQWJnIKY6ohrWxaqIwFMC0tgMTquTkOZM3XeDE2lImkIAf2Bc4TsCWVkw2B2diiCEcREr0HOyaGOUpKAzrgI1r4XzNc2OtZvmJgw+Qg1K6Cl/5jpb7WCKU3U99Z9fzyfecNyK3+xHk9m80El9UzrOVTqdYFaFZCp/IUrLRp4Bv3xpmZQMFnMB9WdvCNLd3tHtivIollGnleyyvNKmnsanZIhVeo38s3uguZMar6bUPpe/Ycq9f8YmvnrB1v9xO5a8GpMdksP7vNWcHWN21YxvHy0p6TLoAgprggr/mLk2MdfLgt1WRQGAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:07:22 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "53"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_1.json
new file mode 100644
index 0000000000..4e3051ba67
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V34/aOBD+V05+3iUhLIHmLQW64sSPFcl2ez2dVo4zAd86dmQ7VHTF/94xTrfAqdK9tA9IITPzzWfPfF9eCS33VDIoJ0pWfNtqarmSJHklrDVW1esGpDFiwpsdaJ+TC9OPSPL3Pzek5pLXbT2TtBBQYuBBK6uYEiQh+SLrP0fkhlhhzsuXqgQMT2cf0sdFTo43pKDspW06EJJUVBjAtxzzJTCrtKMDV2ENtHzQUIEGpI+ABpiSJdUHB8kEsgedHxoX2sweFvNJms1ypMM8Kp4ys5rLrUF0V4GAFqb4w4IojIa34eA2GufhMAlHSTT4jKUlNy8Z/wr370kyCHuhf/NENd7D93N9eFws/np+SjfL2RRLkJw+NK5bajdgLF7QnpeARyKr9WqGGVuhCiomnnAGolpSSbdQZjuqS8R9O/FWq7aZ4w2QeARxBOO7URhHFbsbAx3csWoEiMbP4sVwHPfjfjQM40EVVnGBcUELEMZPT3D54h5fyQ4vEut21jYmCQImVFvelrDv1UpuVVn0mKoD2vCAWkFNsI+CExkT/IxJ0A3ABAaoZrvbd1FM3NDEaVKiwiH9praBX69A4+0rDX+qwrwxueh80fU8+7dTNZI2Zqfs/yH6I/foBOki0/dL+q/SHxH8pGUy7oXkLXbxuuemImntBXQ2qYa25kxtDbfX+tTQCM5OdpE1wPwina8fvVy/4TvXqq1Pe43ZfQexxWpvC74eV18cLGemg0REaawzKKc7xF72w06I8/VD5mQYogyhMB+VaGvoBJ/l6WqabpwAJcpyolppSRKizGlrVcaoOAkLTU7VTesk/1+DaTSUHH1iD9cnN1gPU/VFXgaOnpczh2u0I8ZAoOu4l7/iaIOjI8yV5vZAkpH7431m5WebPmXEe+ZaisOvulw/z67lY/Y8S7P8uX9azK9KwvznyxH3ic/pij/j4x++UitlJ6Bt132ebe4363X+yVUge/u9ZLKZpfl8de++OHTbWRwKDL35tKTu0+R9/3qee6+IDU6IGsgOKMsaARd5Ro7fAByjXY4hBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "798"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:23 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "69"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_2.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_2.json
new file mode 100644
index 0000000000..5e8829b48b
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXY8aNxT9K5Uf8tKF+WAZyEirigCJqGBZMbPZNFW1Mp4LuOuxJ7aHiKz4770ezyawSar2IZFAAl/fc7/OPX4ktNhTyaAYK7nh21pTy5Uk6SNhtbGqXFYgjRFjXu1A+zu5MFFM0j//uiAll7ysy6mkawEFGm60soopQVKSz7PoPiYXxApz6r5QBaB5Mn09up3n5HhB1pQ91FULQtINFQbwlON9Ccwq7dKBZ2YNtLjRsAENmD4CGmBKFlQfHCQTmD3o/FA502p6M5+NR9k0x3SYR8UqM6u53BqHbix1vghPSiW3qlinQWCAarbrvIyTjtmhsROG+OkmXIhht73WKWDflWDTeBBGg4tvukT/3yX+N5fgN5zIldU1vKC13WWq1gyuaIHTeKGhEpzRDOwVtYKazodSwv7DEzTW/1Rqpvdfqv3V6P1Zxd+O37QWO29hgl90j8O43wl7nXiYh/00HKRx7z3GKLh5yPgnePOKpL2wG/qTO6oxxScCvL6dz/+4vxutFtMJuuAU9aFyYxnZFRiLTNrzAnD25Hp5PcUbW6HWVIz9ZDMQmwWVdAtF5kpD3M/U2GpVVzM3y2QASQzDy0GYxBt2OQTau2SbASAaP7Gv+8MkSqK4Hya9TbhJ1mgXdA3CeJoLLh/cz0eyQ8ah387aymC/mFB10TSnbVSXqTKgFQ+a5gf7OGiSMcH3MglappqT3hPHbtFQWmyw5T8pbOD3MNDYfaXhd7U2nzM5i3wW9fT2T0/VSFqZnbL/JdEvd49OuZxl8mpB/1b6LYI3okeGXbchre3suOumImnpleZkUhWtzYksVdw+F7J2JRvFqYB5Ip3Sj57Tr//SharLhtd4O3IQW/T2+un9kfriYDkzLSQiSrfZDNzeIfYiCttFnC1vMreGIa4hrM1bJeoSWmXM8tH1ZLRyCyhxLceqlpakIa45KovKGBXNYuFroMqqdiv/tRJXGgqOgrqH55Ub9IeJ+ijPDUeflxOH52hHtIFAeXaHP6K03tElzJXm9kDSgfvjdebaz3Z0lxH/uCylOPyo5vp5tiFvs/vpKMvvo4aYn5SE2ffJkUTE32md3+PPX7ynVsqOQds2+ixbvVktl/m7yIu+fXKZTeZOTi3dtvKGy4W63BDUvd/+cXw+y73fhhVOhxrIDriSJYLN84wc/wG1G+UGRggAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "898"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:15:17 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "66"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_67e630a47062fc48ea34e9ec_1.json
similarity index 66%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_67e630a47062fc48ea34e9ec_1.json
index ed65a578bd..e5febf80c2 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_67e630a47062fc48ea34e9ec_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAACWOvQ6CMBSF3+XOOIiCyKwxLGhgNIZc2os2aUtDi6EhvLsF1/OdvxlYLyUxJ3pdoiLIQfVfQRYi4OiwRbtqFpWR1KhOiikQoTlNxSWA9ETHuMvOyFtMk/0BM5bGyCiYFBoj9NtCPgP3GpVgkLthpAg6QZIHoEcplwj0f3hr3SVxyFqHbgwGKMrmUd1v1bWuV9nrXnsVwPMVgfNm+0Y4sA8sP/MEwDLLAAAA",
+  "Body": "H4sIAAAAAAAAACWOywqCQBSG3+WsJ5A0LddFuLHQZYScxmMNzA1nDEV890bb/t9/m4EbKYl7YXSJiiAHZb6CHDBo0eML3ao5VFZSozopxkCEbmkszgGkGaVxhEkWpfuOJ0fCOKET8WBSaK3Qbwf5DO2kUQkOue8HYtAJkm0AepByYaD/w1vrLj1kIew8+iE4oCibe3W7Vpe6XuVJGz2pAB5PBn6y2znCnn9g+QE+JelozAAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/fts/indexes/67e42f89adba6513a8c62ace",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926/fts/indexes/67e630a47062fc48ea34e9ec",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "180"
+      "181"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:08 GMT"
+      "Fri, 28 Mar 2025 05:16:22 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "73"
+      "41"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_sample_mflix_movies_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_sample_mflix_movies_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_sample_mflix_movies_1.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_sample_mflix_movies_1.json
index 863322ebdc..21e2c1a0e4 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_sample_mflix_movies_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_sample_mflix_movies_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAACWOwQ6CMBBE/2XPaCIKImeN4YIGj8aQtV20SbsQWozV+O+2ep33MjPnNyCj9i8aoQQ9CWKaW2UGTZCA6LUm4VTPNRoKgukfimwgEh1e0cbMYrRb02n1DESxpGe1DSBf0yrtig3KK+bZYomFyFMUsdjgMCi+WSjfID2jUQJKN070SYD/U7+eWZYG2zp0U3Chqttjc9g3u9Mpxp579iaA8yUB54ffG8JR3OFz+QJBaLSn2gAAAA==",
+  "Body": "H4sIAAAAAAAAACWOwQ6CMBBE/2XPaIggKGeN4YIGjsaYtazapF0ILYZK+HcLXue9zMx1BGRU7ksdZKB6QUxrI3WrCAIQjVIkrGy4QE1e0M1HkvGkRosPNHNmcLbv+qnk4Inkmob84EGSUhKFGKdhsnmKeEcYxbQn4SWNbSv5ZSAboXaMWgrIbNfTFAD/p5aeVbJNvW4s2t7LkBf3S3k+lceqmmPHDTvtwfUWgHXtcoewE2+Ybj8A1ZhO2wAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/fts/indexes/sample_mflix/movies",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926/fts/indexes/sample_mflix/movies",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:16 GMT"
+      "Fri, 28 Mar 2025 05:16:28 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "52"
+      "36"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_67e6306658616125063f2609_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_1.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_67e6306658616125063f2609_1.json
index 80914965da..6d08827afa 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_67e6306658616125063f2609_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAD2LvQrCMBCA3+VmA03SXGpmQUSsIILgImd6VSG1kqST+O5GRNfv5wmnWwcO0HKteqOpOxMaqanxqGw/hxn4MKXMsaWBS5iYor8K23zMODwCZ15QLuo+hVBYZPoRUJUyotJC4V6iq9FJeSwfxzjGDadEl/+X8nc5bHfrVbuE1xuQN6AwmgAAAA==",
+  "Body": "H4sIAAAAAAAAAD2LwQrCMBAF/2XPBjZbsqY9CyJiBREELxLqaoXUyiY9if9uRBTeaebNE063MzTAc+EKmZ1ny5YccnUhxhpm0MUpZdE2DFKOSYJ2vamJP2ocHlGyLEIu7j7FWJhK+BEgJGewMuT36Bpb5o+lE9VRN5JSuP67lL/JYbtbr9olvN50XhuamwAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/sampleDatasetLoad/67e42f53adba6513a8c627f9",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/sampleDatasetLoad/67e6306658616125063f2609",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:11 GMT"
+      "Fri, 28 Mar 2025 05:15:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "46"
+      "25"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_2.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_67e6306658616125063f2609_2.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_2.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_67e6306658616125063f2609_2.json
index 36b7962527..490dc1d8e1 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_2.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_67e6306658616125063f2609_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHXLsQ6CMBRA0X95M01oS1vsKmyiDkwu5lkeaFLEtGUy/rs0zs733DdcHwNY0IYqMSqJww214hJrp4UZd1CA82tMFI440wYjYXB3ZupclvnlKVGDKSdRCsVKyYTuubaVsWV1ySoQ/jPacp4NhbCEjmLEaVPP1fsCYvot+1N3PrR928DnC08WLX2uAAAA",
+  "Body": "H4sIAAAAAAAAAHXLvQ6CMBRA4Xe5M036k15LV2ETdWByMQ1elaSIuS2T8d2l0dX5fOcF5/ECHnBDaCSidahQaSvRXDXKGioY4pIy8T5MtMJEgYe7qDWWNE/PSJmakEvTUlshjdCul9Yr9MqdimIK/4z9GWKeuaOUwm1VjyXGClL+LttDd9y1fdvA+wPfT8gPrwAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/sampleDatasetLoad/67e42f53adba6513a8c627f9",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/sampleDatasetLoad/67e6306658616125063f2609",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "150"
+      "148"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:05 GMT"
+      "Fri, 28 Mar 2025 05:16:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "37"
+      "23"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSearch/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index eeb6ac1be0..6e5aaed2fd 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:50 GMT"
+      "Fri, 28 Mar 2025 05:07:22 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_67e42f89adba6513a8c62ace_1.json b/test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_67e630a47062fc48ea34e9ec_1.json
similarity index 63%
rename from test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_67e42f89adba6513a8c62ace_1.json
rename to test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_67e630a47062fc48ea34e9ec_1.json
index fb56c26428..c3466dacb5 100644
--- a/test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_67e42f89adba6513a8c62ace_1.json
+++ b/test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_67e630a47062fc48ea34e9ec_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJjb2xsZWN0aW9uTmFtZSI6Im1vdmllcyIsImRhdGFiYXNlIjoic2FtcGxlX21mbGl4IiwiaW5kZXhJRCI6IjY3ZTQyZjg5YWRiYTY1MTNhOGM2MmFjZSIsImxhdGVzdERlZmluaXRpb24iOnsiYW5hbHl6ZXIiOiJsdWNlbmUuc2ltcGxlIiwibWFwcGluZ3MiOnsiZHluYW1pYyI6dHJ1ZX19LCJuYW1lIjoiaW5kZXgtNTIiLCJxdWVyeWFibGUiOmZhbHNlLCJzdGF0dXMiOiJQRU5ESU5HIiwidHlwZSI6InNlYXJjaCJ9",
+  "Body": "eyJjb2xsZWN0aW9uTmFtZSI6Im1vdmllcyIsImRhdGFiYXNlIjoic2FtcGxlX21mbGl4IiwiaW5kZXhJRCI6IjY3ZTYzMGE0NzA2MmZjNDhlYTM0ZTllYyIsImxhdGVzdERlZmluaXRpb24iOnsiYW5hbHl6ZXIiOiJsdWNlbmUuc2ltcGxlIiwibWFwcGluZ3MiOnsiZHluYW1pYyI6dHJ1ZX19LCJuYW1lIjoiaW5kZXgtNjU3IiwicXVlcnlhYmxlIjpmYWxzZSwic3RhdHVzIjoiUEVORElORyIsInR5cGUiOiJzZWFyY2gifQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/search/indexes/67e42f89adba6513a8c62ace",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926/search/indexes/67e630a47062fc48ea34e9ec",
   "Headers": {
     "Content-Length": [
-      "237"
+      "238"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:08 GMT"
+      "Fri, 28 Mar 2025 05:16:22 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "100"
+      "78"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_1.json
index da1a024b2e..d488850bf3 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGAwIK+durdLqw6HfYAVg5Ft0iHi30saNS1LxeL5nt496XRXIs3iA7onu0yBiCwh0iEEVEQQljGeZkXKqpe8EkUtePZGEqJvs6rGkikuQbVQ8byARvKuwWabGz2dPRHvVzI47DZ2CGH2glJp7KJShZfTaKfeqvYk7Uhh1hSCAU8vjPbOLrOn/9gdmk3p0XRkTSKsoNJOAfSEzj+27ew78x84Us39PIdaftA4JQoCtODx1R/L2fNxmmY81nLnIjU4K9F7PNTxYOO0fA46oNE+HGj5ZdePhEww4vdfgZNDigzTPCs3i3X98+3fOXYKqoZB0TFUDGulKqmwJOsXPiJ6DkMEAAA=",
+  "Body": "H4sIAAAAAAAAALWTPW/DIBBA/wuzHRD+LGun7u3SqsMFjhgVgwU4HSL/9zqNmtZL5YX5nt496XQXIu0cE4ZHP7tEBCuIDAgJFRGEM96UrCp5/8wawTrB+SspiLnO2g5bjn3dsZZrWfcIVS11h+vcGvcRiXi7kCGgXtkhpSkKSqX1syoVng+jdyevjgfpRwqToZAsRHrm9BT8PEX6jz2gXZURrSZLkWEFld4lMA5DvG/b2DfmP3Cmmtt5drX8oHlKFCQ4QsSXuC9ny+dpmnBfy43L1BC8xBhxV8edzdPyOZiE1sS0o+WXXd4L4mDE77+CIIcSOZb1Q79afDg9Xf+9Qa2g7TlUmqPi2CnVSoU1Wb4AapuKmkMEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:48 GMT"
+      "Fri, 28 Mar 2025 05:07:16 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2119"
+      "5403"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_1.json
deleted file mode 100644
index f98b1d6de1..0000000000
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/bgmBAV2+pcAqJn6JpO3WaaqMfYBXx45sh4lW/O87Y9oCU6V9aT8ghdzdu2ffvZcnQvmaKga8q9VCLCtDndCKJE+EVdbpYlKCslZ2RbkCE3JyaeMGSX7+OiOFUKKoir6icwkcA1OjnWZakoTkwyy+b5Az4qQ9LB9pDhju9b+m18OcbM/InLKHqtyDkGRBpQV8KzBfAXPaeDpwEjZA+dTAAgwgfQS0wLTi1Gw8JJPIHky+KX1o1p8OB9006+dIhwVUPGXmjFBLi+i+AgEd9PCHBY16o3Veb5432nncTpqdpBXfYSkX9iETj3B1SZJmvVYPb26pwXt4PtfX6+Hwx/1tOhv1e1iC5Mym9N1SNwPr8ILWggMeiYwn4z5mLKWeU9kNhDOQixFVdAk8W1HDEfflxEujq3KAN0DaHfjc4C1G+Zy2W3GTXrDW4gIuEE0cxBdHcfolxrikc5A2TE8K9eAfn8gKLxLrVs6VNokiJnXFzzmsa4VWS83nNaaLiJYiok5SG60b0Y6Mjd5iEu0HYCML1LDVeceTMyB3g5ILnNHHdI3CckUG714b+Kbn9oXIUeOjpofZH83UKlralXb/w/M1d+vV6CO9yxH9rc0NYu+ETC5qdfISO3pda2NA0SKo53VMJa3sgdJK4U61aaCUgu2sIiuBhSU6XD04Xr0W952qYrfTmB17iCVWB0sI9bj2cuMEs3tIRFTWeXPymkPsUVzfi3AwmWZegnWUIMztjZZVAXuxZ3k67qUzLz6FkuzqSjmS1FHitHI6Y1TuRIUGp4uy8nL/11xKA1ygR6zh9OQW66Gn/6jjwDbw8sZwirbFGEh0HP/yPY7W3HrCQhvhNiTp+D/BY8ZhtOltRoJfTpTcvNflhnnuW15n9/00y+/j3V4+agWDt5ej7XfO5+yL7/DxU6g0WrsuGLfvPshmV7PJJP/unQzZu+eS7qyf5oPxlf/agHfj3Wr6j1Fw+tMproMMZjgXaiHboBQLhBnmGdn+BUAIPP8TBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "780"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:50 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "557"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_1.json
new file mode 100644
index 0000000000..3b602466f0
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V247aMBD9lcrPuySEJdC8pUBXVFxWJNvtRdXKcSbgrmNHtkNFV/x7x5hugapSX9oHpJCZc+bYM2fyTGi5pZJBOVKy4utWU8uVJMkzYa2xql42II0RI95sQPucXJhuRJLPX65IzSWv23oiaSGgxMCdVlYxJUhC8lnWfYzIFbHCnMLnqgQMjydv0/tZTvZXpKDsqW2OJCSpqDCAbznmS2BWaScHLsIaaHmnoQINKB8JDTAlS6p3jpIJVA863zUutJrczaajNJvkKId5VjxlZjWXa4PsDoGEFsb4Q0AURv3rsHcdDfOwn4SDJOp9QmjJzVPGv8PtG5L0wk7o3zxQjffw81xv72ezj48P6Wo+GSMExeld46qldgXG4gVteQl4JLJYLiaYsRaqoGLkBWcgqjmVdA1ltqG6RN6XE6+1apsp3gCJBxBHMLwZhHFUsZsh0N4NqwaAbPwkXvSHcTfuRv0w7lVhFRcYF7QAYXz3BJdP7vGZbPAiEbextjFJEDCh2vK6hG2nVnKtyqLDVB3QhgfUCmqCbRQcxJjgT0qCYwNMYIBqtrl+HcXENU0cOiUqbNJ/Khv48Qo03r7S8E4V5kXJWeWzqqfZ/12qkbQxG2X/Ruiv3L0zpIuM38zpV6XfI/nBy2TYCclL7Ox1x3VF0tob6KRTDW3Nidsabi/9qaERnB3WRdYA84N0On70fPz6r12ptj7MNWZ3HcUa0X4teDyOvthZzsyREhmlsW5BOd8h97wbHo04Xd5lzoYh2hAK816Jtoaj4bM8XYzTlTOgRFuOVCstSUK0OW2tyhgVB2PhklN10zrL/75gGg0lxz2xhcuTG8TDWH2T54G91+WWwyXbHmMgcOu4l//iaL29E8yV5nZHkoH74/fMwvc2fciI35lLKXb/6nJ9P48l77PHSZrlj93DYH5XEqZ/Ho64S3zOEfwJH195pFbKjkDbY/VptrpdLZf5B4dA9fYnZLSapPl0ceu+OOA28mE03QfJb/vLLm69D1bYF2og26EZa6SZ5RnZ/wClvgS3FwcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "790"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:22 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "538"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_1.json
similarity index 57%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_1.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_1.json
index 56c5dd5d4b..4b114a284a 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_1.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_fts_indexes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAK1T3U/CMBD/X/o8jU5B5Y34FRKDBh4NIbf2YA1du7SdWMn+d3sDhiKSmPi0rff7urtuxUCDCh9oWY+piqPGU+dBC7CCJW3Rsd7rivEc7INUfv09SZiGAiNvgWFprHgyS7S34DASvVmg3mFXzIeSoIownDD1ZIOSjXmL2Iixuk5+d9xG/B/LtuGaENwohdxLo4drs9I476KBAA8Z6UQGFKXCqbcgtdTzWJRa4PvgLta6V3iZzm7OQGTQ7ZxfwDXvplmaRVABZRnhjrxFiL1IznozUA4TNpOoRFPJjAj0/LmZZS49uhI49VtUykvCFWGM3FAHod9SvtEPLWjbuqX8cdj7JzSIokDtm0y7dFD53PzdIDnSlpM0TRriXBuL/cy8RWra6RyJKQyvKB0pe1iP9IvywQuyp1W316lZ3kknjSCHYHneP/ZTxFdfRUM2GE5fRs+Po/vxmI6DNjoUm4u6NWvkWP0JAM1hRmgDAAA=",
+  "Body": "H4sIAAAAAAAAAK1T3U/CMBD/X/o8DR/ZQN6IXyExaODREHK0BzR07dJ2YiX73+0NmIpKYuLTtt7v6+66HQMNKryhZQOmSo4aL50HLcAKljRFxwbPO8bXYO+k8vvvWcI05Bh5GwxbY8WD2aK9BoeR6M0G9Qd2x3woCKoIwwlTzQ4oWZs3iIMYq6rkd8djxP+xbBquCMGNUsi9NHq8NyuM8y4aCPCwIJ3IgLxQOPcWpJZ6FYtSC3wd3cRa1sOs24KrtJ+1s3YnbWXdZaeP3QjKoSgi3JG3CLEXydlgCcphwpYSlagrCyMCPb9vZruWHl0BnPrNS+Ul4fIwRW6ogzBsKF/oPy3o2Lql/HHYpyc0iDxH7etMH+mg9Gvzd4PkTFtO0jRpiCttLA4X5iVSO2l6JqYwvKR0pOxhP9JPyj9ekBOtqrlO9fIusrQXUQ7B8vXw3F8RX30ZHdloPH+aPN5PbqdTOg7a6JAfburRrZZj1TsFwhY3aQMAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "374"
+      "376"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:11 GMT"
+      "Fri, 28 Mar 2025 05:16:25 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1995"
+      "1854"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_1.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_1.json
index e56c81f986..5c2ee93793 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_1.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGVPyw6CMBD8lz1joiiInDGGC/Hk1Sztok3aUttCIIR/t6CevE3msTM7AWulJOZFqytUBDmothfkIAKOHmt0C+dQGUl31UgxBEVoTkNZBCE90iFushPyGtNkt8eMpTEyCiaJnpwvqBFaLOchn0ChMUI/3IL5qFEJBrm3Hc3zf+BG1n1z/Q9ug09/dq4jNkkcql4d2RFrGegGpaMInEffhRq4nquirC7B5EezvkJo2RPmN9ir6ln6AAAA",
+  "Body": "H4sIAAAAAAAAAGVPyw6CMBD8lz1jQgSLcsYYLsSTV7OURZu0pbaFQAj/bkE9eZvMY2d2Bt5JSdyLTleoCHJQ3SDIQQQNeqzRrZxDZSTdVSvFGBShGxrLIggsI5bEmGYx27c8PRImKZ2IB5NET84X1Aot1vOQz6DQGKEfbsXNpFEJDrm3PS3Lf+BG1n1zww/Gwac/O7cRO3bIQterJzthLQPfonQUgfPo+9AD13NVlNUlmPxktl8ILX/C8gYAv+vO+wAAAA==",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/search/indexes",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926/search/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "195"
+      "196"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:05 GMT"
+      "Fri, 28 Mar 2025 05:16:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2689"
+      "2512"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_2.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_2.json
similarity index 58%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_2.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_2.json
index 7289c71ca2..0e86d6b11b 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_2.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAIVRy0oDMRT9l6yr2KpN7W6wIt0UQXErt8mZTiDJxDzUscy/m4w6CK10F3Lved2zZ6LVGiKq1m7IgC2Z02QRA5swSZG2FMpnIOM0XnZJSZSRshIf61WezDmuZvVC3HC+nXE+rznxxeV0mpc0RYS4Qq2sKgJsuWdkSXef8Bmpk4DFeYhkJXmZAYacU3YXyqLsLBkl2LImHTBhtYKWw8SQslU0bXANPE6Sxs4NCaLP1KyfMDvkPIZ6b1R27EigmEk6qkGve4RoC11XjZBj8NrDiuZQsj9iIiRfZ50nGAdPMXncnkwyniT6hJFTtiIZ2Jh1Ci/Ii6b6n6Y/7OUZPvzU8/b7vBgP9d312fUsO3hN8B1tNcZaMm9MuRb2cLdZrTf3f9IPTlj/BUQr3RdjAgAA",
+  "Body": "H4sIAAAAAAAAAIVRTUsDMRD9LzlXqbbuSm/FivRSBMWrTJO33UCSjclEXcv+d7OrLkJbeguZeV/z9kI2xkCybtyGLMRCeEMOHMVEKGLaUuw/I1lv8LpLWqEfaafwuV7lSVGimE2pLKfFdSXnt6DZHHQl85IhRuQVKu10LyAWe0GOTPuFkJEmSThcRianKKgMsOS9drvYL6rWkdVSLCoyERNRaRg1TCxpt2TbRF8j4Cwpt35IwCFTi24i3JDzGOqj1tmxJ4neTDKsB732CbLp6drlCDkGrwKcrA8luyMmYgpV1nmG9QjEKeDubJLxJBwSRk7VyGThOOv0vKAg6+Vpmu6wlxeE+FvP+99zOh7qp+uL4qbMFt4SQktbg7GXTMwp9yIe7zer9ebhX/zBiui+AYYQ4M9kAgAA",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/search/indexes",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926/search/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:08 GMT"
+      "Fri, 28 Mar 2025 05:16:23 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "3037"
+      "1638"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_3.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_3.json
similarity index 61%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_3.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_3.json
index c99da476b3..27f3a1732c 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_3.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_clusters_search-926_search_indexes_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQQU/DMAyF/4vPHUIdNKw3pCK0S8WJC0LITdwRKUlLnCJK1f+Os7EJiZvl92x/zwvowTnSyQ6hRU9QwzhwYijAYMIOObcY/ejoLUW0wYaDiDYY+to3olWKbsp+V+6U6kqlql6hutvedmJymIhTQ71M5QNQL+BxHGUF59rMAb3VUPfomAroLTlzVPTgPQXBqF/+2FKcxJXmMTOZQU/ZA2uxnHucYsZbX9e1ACaM+v0+oJu/KYrqJk2BrjhhMBiNDP4jfKbIv6Cf5/JafOH0mmPqDcaI82ZbVRLxY6I4Y+foEkLWp0nA4emhbfbtI1yIT0Cw/gDKw5LMdAEAAA==",
+  "Body": "H4sIAAAAAAAAAGWQQU/DMAyF/4vPHWo3NUBvSEVol4oTF4SQm7gQKUlL4iLK1P+Os7EJiZvl92x/zwfQo3Ok2Y6hQ0/QwDQmTlCAQcYeU24l9JOjV45ogw1vItpg6GvfiqauSe1K7OsbValqW5dqN2xvy1pMDpkStzTIVD4AzQE8TpOsSLk2S0BvNTQDukQFDJacOSp69J6CYDTPf2wcZ3HxMmUmM+o5e2AtDude4pjx1pd1LSARRv1+F9At3xRFdbOmQFeJMRiMRgb/ET5RTL+gn+eyFF84veaYeoMx4rKplJKIHzPFBXtHlxCynmcBh8f7rt13D3AhPgHB+gOcCn3ZdAEAAA==",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/search/indexes",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/clusters/search-926/search/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:14 GMT"
+      "Fri, 28 Mar 2025 05:16:27 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1883"
+      "1022"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_search-78_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_search-926_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_search-78_1.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_search-926_1.json
index 510a37f0a3..6f08baa051 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_search-78_1.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e62e847062fc48ea34cf7e_sampleDatasetLoad_search-926_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAD2LvQrCMBCA3+VmA03SXGpmQUSsIILgImd6VSG1kqST+O5GRNfv5wmnWwcO0HKteqOpOxMaqanxqGw/hxn4MKXMsaWBS5iYor8K23zMODwCZ15QLuo+hVBYZPoRUJUyotJC4V6iq9FJeSwfxzjGDadEl/+X8nc5bHfrVbuE1xuQN6AwmgAAAA==",
+  "Body": "H4sIAAAAAAAAAD2LwQrCMBAF/2XPBjZbsqY9CyJiBREELxLqaoXUyiY9if9uRBTeaebNE063MzTAc+EKmZ1ny5YccnUhxhpm0MUpZdE2DFKOSYJ2vamJP2ocHlGyLEIu7j7FWJhK+BEgJGewMuT36Bpb5o+lE9VRN5JSuP67lL/JYbtbr9olvN50XhuamwAAAA==",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/sampleDatasetLoad/search-78",
+  "Path": "/api/atlas/v2/groups/67e62e847062fc48ea34cf7e/sampleDatasetLoad/search-926",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:11 GMT"
+      "Fri, 28 Mar 2025 05:15:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "112"
+      "74"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/memory.json b/test/e2e/.snapshots/TestSearch/memory.json
index 05eb90fe31..b3f5b85487 100644
--- a/test/e2e/.snapshots/TestSearch/memory.json
+++ b/test/e2e/.snapshots/TestSearch/memory.json
@@ -1 +1 @@
-{"arrayRand":"AW4=","rand":"NA==","searchGenerateClusterName":"search-78"}
\ No newline at end of file
+{"arrayRand":"pg==","rand":"ApE=","searchGenerateClusterName":"search-926"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json b/test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
index b7a958c8be..7e895a8875 100644
--- a/test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/fts/indexes/67e42f89adba6513a8c62ace",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90/fts/indexes/67e632c17062fc48ea34f86f",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:08 GMT"
+      "Fri, 28 Mar 2025 05:25:24 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "80"
+      "65"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_provider_regions_1.json
deleted file mode 100644
index 080a90be98..0000000000
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHLGqrNaKKNIhwO/sIqDIRLtrYalTUlSHyb+98WKqFPa7DE3J/ee5CY5IEaTb4mcrwPaCYiQg3ZKpdLBeMN4Fr6EsK/FPNnycF3b8BiTlGKiGJF438BbwbNU4rYNrUbUbXVte92w7XZkE7vT7Fg6RSYVCIlTwfc0BIEFbClP5BtN9FwIPZ4lylUig8oFka63CCqKgnCHVr2Ski2Msti1KlRBLCcgJjriWvU6qiIBTAtLYBE6Lk9DmTF13gxNpCLJBgL6A+cI2RPKyJrB9OyQB0OIiF6DnJNDFSUkBp1xHqx8L5itLHSs3jARYfIRapRAC/8x099qOVOYqOetev5oNvUGxVb+fDUaT2f9UuqZ1nOo0OsCNUsgU/kLV1g08Az6403MoGA8n/XLO3lHFu72jmyVkHmzjDyvZJnnlTT3NDolQ6rQb+ib3QXNmdR8N6H0vfoPVej/MTDz1w+2/IndteDVmLQLD+7zVnB5jVv1fHj5aE9JF0EeUlwRlv/FyLGOv3VfH00UBgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "414"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:19 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "77"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_1.json
deleted file mode 100644
index 421d792019..0000000000
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227aQBD9lWqfA76QYOI3B2hExSXCTtOLqmhtD7DNetfaXVPRiH/vLOukhKpVX5IHJOOZOXN2Z87xI6HllooCyqEUK7ZuFDVMChI/kqLRRlaLGoTWfMjqDSiXk3EdhCT++u2MVEywqqnGguYcSgzcKGlkITmJSTZNg/uQnBHD9XH5TJaA4dH4fXI7zcj+jOS0eGjqFoTEK8o14FuG+QIKI5WlAydhBbS8UbACBUgfATUUUpRU7SxkwZE9qGxX29ByfDOdDJN0nCGdwqHiKVOjmFhrRLcVCGhghD8sCP3wouP3OmE/C/rxeRSH/hcsLZl+SNlPuL4icc/v+u7NHVV4D0/nen87nX6+v0uWs/EIS5Cc2tW2W2KWoA1e0JaVgEci88V8jBlrLnPKh45wCnw1o4KuoUw3VJWI+3zitZJNPcEbIP0IzsPV5fllFOVhFPVXEY0GvUGAaOwoPqBlTvsXQY8Oin6YRxHGOc2Bazc9zsSDfXwkG7xIrNsYU+vY8woum7JTwrZbSbGWZd4tZOXRmnnUcKq9begdyGjvb0y8dgDa00BVsekMAstOAT9Miq9wSG/U1nPr5Sm8fangg8z1M5MXnV90Pc5+c6pa0FpvpPkfor9z91aQNjK6mtHvUn1E8IOWyaDrk+fYi9fdPgYErZyAjiZV00Yfqa1m5lSfCmrOioNdpDUUbpH+sX79C9uqqQ57jdmBhVhjtbMFV4+rz3eGFbqFREShjTUoqzvEngV+K8TJ4ia1MvRRhpDrj5I3FbSCT7NkPkqWVoACZTmUjTAk9lHmtDEyLSg/CAtNTlZ1YyX/p8HUCkqGPrGF05NrrIeR/CFeBvaOlzWHU7Q9xoCj69iXr3G03t4SZlIxsyNxZP84n5m72SZ3KXGeuRB891qX6+bZtrxN78dJmt0Hh8X8KQVM/rEcJXE5bfEXfHznKpWUZgjKtN0n6fJ6uVhkn+yWInvzVDJcjpNsMr+2Xxy6bi0OBYbefFhS+2lyvn86z61TxBInRDWkO5RlhYDTLCX7X0OuehshBwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "792"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:20 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "67"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_2.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_2.json
deleted file mode 100644
index 4ee8dd6eb3..0000000000
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW8aORT9K5Uf+rKB+SBh6EhRRYFWVBAiZtLstlpFnpkLuPHYI9tDl0T8970eT1pg26j70Eogga/vuZ/n+JHQYktFDsVIihVb14oaJgWJH0leayPLRQVCaz5i1QaUu5NyHYQk/vT3GSmZYGVdTgTNOBRouFbSyFxyEpN0lgR3ITkjhutD97ksAM3jydvhzSwl+zOS0fy+rloQEq8o14CnDO8LyI1UNh04MSugxbWCFSjA9BFQQy5FQdXOQuYcsweV7iprWk6uZ9PRMJmkmE7uULHKxCgm1tqia0OtL8KTUoq1LLLY8zRQlW86gyDo6A0aO76Pn+7FPz0O3fZap4BtV4CJw8gPorPvugT/3yV8zsV7jRO5NKqGl7Q2m0TWKodLWuA0XiqoOMtpAuaSGk51xwS9zw/1EzTW/1Rqorbfqv1Dq+1Rxd+P37QWO29gjF90D/3wouP3OmE/DfrxeRSH/keMUTB9n7AHePeGxD2/67uTW6owxacFeHszm/11dztczidjdMEpql1lxzI0S9AGN2nLCsDZk6vF1QRvrLnMKB+5ySbAV3Mq6BqKxJaGuF9XY61kXU3tLPsRnIerV+evoigLo6i/img06A0CRGMH9gEtMtq/CHp0kPfDLIrQzmkGXLs150zc25+PZIMbh34bYyqN/cq5rIumOW2jurksPVoxr2m+tw29Jhnt/SgTr91UfdB7YrebNyvNV9jy3xTWczz0FHZfKngvM/01k6PIR1EPb//2VLWgld5I8zOJfru7t8plLeM3c/pZqg8I3ogeGXQtQ1rb0XG3jwZBS6c0B5OqaK0PZKli5lTIWko2ilNB7hbpmfXrX9hQddnsNd4OLMQavZ1+On9cfb4zLNctJCIKy+wcLO8Qex74LRGni+vE0tBHGkKmP0hel9AqY5IOr8bDpSWgQFqOZC0MiX2kOSqLTHLKG2LhayDLqraU/68SVwoKhoK6hdPKNfrDWH4Rx4a9y8uKwynaHm3AUZ7t4a8orbe3CTOpmNmROLJ/nM5cudkObxPiHpeF4Ltf1Vw3zzbkTXI3GSbpXdAs5oMUMH1mOQri7rTOH/HnC+eppDQjUKaNPk2W75aLRfpn4ETfPLlMxzMrp4auW3lDcqEuNwtq32/3OJ7OcuvYsMTpUA3JDilZItgsTcj+XxspU3dGCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "894"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:54:55 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "88"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_provider_regions_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_provider_regions_1.json
index 75374a2b61..2799262bb8 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0se+uSM9ToKZRTpcOANqzgYItGe1rC0KUnqw8T/vlgRdUqbvTUnX8/5kpPkgBhNvyVyvg5oJyBCDtoplUkH4y3jefgSwr6e8DTm4aa+5QkmGcVEMSLxvoljwfNM4m4P2s2wAyTckG7HbpHXbSfSXzpFLhUIiTPB9zQEgQXElKfyjaZ6LoQ+z1PlKpGDdUGk6y0DS1EQ7shuWBmJYZwnrm1RBYmcgpjqiGs3GqiGBDAtLIFF6Lg6DWXO1HkxNJWKpFsI6A+cI2RPKCMbBrOzQxEMISL6H+ScHGooJQnojItg7XvBfG2jY+2GiQiTj1CzAlr6j5n+ViuY0kR9b933x/OZNyy38hfr8WQ2H1RSz7SeQ6VeF6hVAZnKX7jSooFn0B9vagYFk8V8UN3JO7J0tXdku4IsmmXkeSWrPK+kuafRLhlSpX4j3+wsaM6k5rsJpc/Vf6hS/4+hmb++sNVX7K4FHWOyV7pxn7eCq2vcbhTDy0N7SroMipDiirDiLUaOffwF/FPytBQGAAA=",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHKm9ToKZRTpcOANqzgYItGealjalCT1YeJ/X6wUdUqbPebkyzlfcpIcEaPJt0TO1xHtBUTIQXulUulgvGU8C19CODRinux4uGlseYxJSjFRjEh8aOKd4FkqcbcH3ZZFwp7VbUbb9iuQVhtIx9IpMqlASJwKfqAhCCxgR3ki32ii50Lo8yxRrhIZ1ApEut4yqCkKwh3ZVi0lOxhnsWvXqIJYTkFMdcS1LQvVkQCmhSWwCJ1W56HMmLpshiZSkWQLAf2BS4QcCGVkw2B2cciDIUREr0HO2aGOEhKDzrgI1r4XzNc2OtVvmIgw+Qg1K6Cl/5jpb7WcKU3U99Z9fzyfecNyK3+xHk9m80El9UzrOVTqVUCtCshUvuBKiwaeQX+8qRkUTBbzQXUn78jS3d6R7Qoyb5aR55Ws8ryS5p5Gp2RIlfqNfLO7oDmTmu8mlL5X/6FK/T+GZv76wVY/sbsWdIzJXunBfd4Krq5x28qHxUd7TroM8pDiirD8L0aOffoFKt8gtRQGAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
+      "Fri, 28 Mar 2025 05:16:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_1.json
new file mode 100644
index 0000000000..57cb7c20f7
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPTew4S9r5zU3SIkMuhe22W4chkG0m0SpLhiRnSIv8+6jIvSTDir20DwZskTw8InnoR0KLDRU5FAMplmxVK2qYFCR8JHmtjSznFQit+YBVa1DOJ+W6E5Dwx88TUjLByrocCZpxKNBwpaSRueQkJOkk6SwCckIM16/Dp7IANA9HF9H1JCW7E5LR/L6uGhASLinXgKcM/QXkRipLB47MCmhxpWAJCpA+AmrIpSio2lrInCN7UOm2sqZ4dDUZD6JklCKd3KHiLROjmFhpRLcRCGhgiA8GBH7Qa/ndVnCW+r2w0w+7wR2GFkzfJ+wBLs9J2PXbvju5pQrr8HSvi+vJ5PviNoqnoyGGIDm1rWy2yMSgDRZowwrAK5HZfDZCjxWXGeUDRzgBvpxSQVdQJGuqCsR9vvFKyboaYwVI/xT6XZ8Wp34/WOafz4B2PwPt+YjGXuyZf2iHHto5zYBr1z3OxL19fSRrLCTGrY2pdOh5OZd10Spg0y6lWMkia+ey9GjFPGo41d4m8PZktPcvJl7TAO1poCpft75Ycgr4vlF8iT36mKyeGy5PYe2lgq8y089EDhIfJH3t/dFMtaCVXkvzPzxffHdWjdYyPJ/SX1LdIPZeyOSsbUvf2A6O2300CFo69by0qaK1fqW0ipljbSqoOMv3qyKpIHdD9MboFV2bqS73M43eHQuxwmi3Elw8jj3fGpbrBhIRhTZ2OVnNIfa04zciHM+vEitBHyUImb6RvC6hEXuSRrNhFFvxCZTkQNbCkNBHidPayCSnfC8qXHCyrGor97+XS6WgYLgjNnB8c43xMJS/xaFh53jZxXCMtkMbcNw49vA9rtbdWcJMKma2JDy1H27HzFxro9uEuH05F3z7XsV1/WxSXieLUZSki85+Lh+kgPEbw5ER59ME3+HrJxeppDQDUKbJPk7iy3g+T791MALZm6eQQTyK0vHs0v5t6KpZbygv3Mv7IbW/Jbfzj/u5cYKIsUNUQ7JFUZYIOEkTsvsDsuQanB0HAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "782"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:32 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "55"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_2.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_2.json
new file mode 100644
index 0000000000..48321460c4
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW8aORT9Kys/9GUDMwwNpCNFFQVasYIQMZNm29UqMp7L4I3HnrU9syIR/32vx5MS2DbqPrQSSODre+7nOX4kNKupZJCNldzwvNLUciVJ/EhYZawqliVIY8SYl1vQ/k4qTC8i8R9/npGCS15UxVTStYAMDddaWcWUIDFJ50nvLiJnxArz3H2hMkDzZPp+dDNPyf6MrCm7r8oWhMQbKgzgKcf7EphV2qUDJ2YNNLvWsAENmD4CGmBKZlTvHCQTmD3odFc602p6PZ+NR8k0xXSYR8UqE6u5zI1DN5Y6X4QnhZK5ytZxEBigmm07b8KO2aKtE4b46fI3D9lDt73VyaDuSrBxNAx7w7OvefT+t0f0kkfwFsdxaXUFr2hlt4mqNINLmuEoXmkoBWc0AXtJraCmw/42os6foLH4pzoTXR9K/dXo+nm5Xw/ftBW7bmGCX/SOwui8E/Y70UUanse9QdyPPmOIjJv7hD/Ah3ck7ofd0J/cUo0ZPg3//c18/unudrRaTCfoghPUu9KNZGRXYCxuUc0zwLmTq+XVFG/kQq2pGPupJiA2CyppDlniKkPcL2uRa1WVMzfHwRAG/ZBmw3AQbdjrC6D910DPXRf4wb4Oj+1wjnZB1yCMX3HB5b37+Ui2uG3ot7W2NNguJlSVNc1pG9VlqghoyYOm90EdBU0yJvhWJkG7pebQeuIWWzTbLDbY8Z8TNfAMDDT2Xmn4Ta3Nl0SOAh8FfX77Z2dqJC3NVtnvyfNwd+8ky1km7xb0L6U/InajduSi61rf2o6OuwM0SFp4iTmMqaSVeSZHJbenAtaysVGaEphfohdWL+u7SFXR7DTe7jmIHL29bnp/XHuxs5yZFhIRpSM1A8c5xF70wpaEs+V14igYIgVhbT4qURXQKmKSjq4mo5Ujn0RKjlUlLYlDpDiKikoYFQ2p8BVQRVk5uv9XgUsNGUchreG0coP+MFH/yGPD3uflhOEUbY82ECjL7vBHlNbfu4S50tzuSDx0f7zGXPnRjm4T4h+VpRS7H9VcP8825E1yNx0l6V2v2csHJWH2wnKsib/TOn/Gn794T62UHYO2bfRZsvqwWi7T33te7+2Ty2wyd1Jqad5KG1ILNblZUPdu+0fxdJa1J8MKp0MNJDskZIFg8zQh+38B2KxzZz4IAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "884"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:24:27 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "66"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
index 19f47a1dfb..eaa3382771 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAACWOyw6CMBRE/+WucdEgVVhrDBs0sDSGXErRJn2FFkND+HcLbueczMwCzEjJmRdGV6g4FKDMV3AHCfTosUO3ZQ6VlbxVgxRzJEL3fC4vEdATP6Ykz7HvkGYkxTOj6dBlUVJordBvB8UCfdCoBIPCjxNfE9D/qb3nQAiNuvPopyhDWbWP+n6rr02zxUEbHVQEz1cCPtj9DseRfWD9AdHnkaq+AAAA",
+  "Body": "H4sIAAAAAAAAACWOwQ6CMBBE/2XPmKiQgpw1hgsaOBpD1rLVJrQltBgawr9b8DrvZWZm4KbriDtpdImKIAdlvpIsRNCiwxfaNbOo+o4aJTo5BSJ1S1NxDoClxOIjP6R7dhQ8yQjjRGRMBElh30v9tpDP0HqNSnLI3TDSEoH+T209uzQ+Bd06dGOQoSibe3W7Vpe6XmOvjfYqgMczAuf77Q7hwD+w/ABhYAQAvgAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes/67e43199adba6513a8c63fb5",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90/fts/indexes/67e632c17062fc48ea34f86f",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "174"
+      "175"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:55:54 GMT"
+      "Fri, 28 Mar 2025 05:25:24 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "42"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_sample_mflix_movies_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_sample_mflix_movies_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_sample_mflix_movies_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_sample_mflix_movies_1.json
index b255c0897a..ab124097c2 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_sample_mflix_movies_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_sample_mflix_movies_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAACWOwQ6CMBBE/2XPaNKgqJw1hgsaOBpjlrJqk3ZpaDFU4r9b9DrvZWYuEyCjDm/qIQc9SGJaOmWsJkhAdlqT9KrjEg1FwXQvRS6SFj026ObM4WzfzF2rMRLFLY3FPoJsQ6tU7HbYNpitRYpbmaX3Zh0lg9YqfjjIJ2gDo1ESct8P9EmA/1O/noUQWdSdRz9EGYrydq5Ox+pQ13McuONgIrhcE/DB/u4Q9vIJn+sXRE4pm9sAAAA=",
+  "Body": "H4sIAAAAAAAAACWOwQ6CMBBE/2XPaFRMQc4a40WNHg0ha1m0Sbs0tBir4d8teJ33MjO3LyCjDh/qoADdS2KaO2WsJkhAtlqT9KrlIxqKgmlfilwkNXq8oxszh6NdmUardySKa3ofthGIjES6kstsIVaNXOeE6brJRRMlg9YqfjgovlAHRqMkFL7raUiA/1NTzyxLN1F3Hn0fZTgcq/PltL/srtcxDtxyMBHcygR8sNMdwk4+YSh/T2jiUNsAAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes/sample_mflix/movies",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90/fts/indexes/sample_mflix/movies",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:56:01 GMT"
+      "Fri, 28 Mar 2025 05:25:30 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_67e6328b7062fc48ea34f758_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_67e6328b7062fc48ea34f758_1.json
index f20dba07cd..43f6b46c51 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_67e6328b7062fc48ea34f758_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2LvQrCMBCA3+VmA03a5GxmQUSsIILgImd7VSG1ckkn8d2NiK7fzxNOtw48OOSq1LavEc8G0fVIWKPpYAZtmGJiaWjgHEYmaa9qrvVHjcMjcOIFpezuUwiZCdOPgCmMVUWpjNtr523lrT3mj0VG2XCMdPl/MX2Xw3a3XjVLeL0BWdLzkZsAAAA=",
+  "Body": "H4sIAAAAAAAAAD2LSwrCMBBA7zJrA2HSfMxaEBEriCC4kRinVUitTNKVeHcjotv3ecLpdgEPxpJR6M5WGuxi4yioprPawQximnIhbsNANcwUOF7FXH7MODwSFVqEUtV9SqkypvAjgBK1kEqg20vtsfFoj/Uj5pE3lHPo/18u3+Ww3a1X7RJeb+J4oFSaAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/sampleDatasetLoad/67e4315f977b2776f7a7972d",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/sampleDatasetLoad/67e6328b7062fc48ea34f758",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "146"
+      "144"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:55 GMT"
+      "Fri, 28 Mar 2025 05:24:28 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "41"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_2.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_67e6328b7062fc48ea34f758_2.json
similarity index 68%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_2.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_67e6328b7062fc48ea34f758_2.json
index 1c85108f09..c1edc6f19b 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_2.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_67e6328b7062fc48ea34f758_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAHXLsQ6CMBCA4Xe5GRJaaE+6CpuoA5OLqXCgSRFzLZPx3W3j7Px//xuujxEMaKSqFGqqEW8SUU9osUY5QgaD23wgPtqFIvRkebjnOyFSWpeXo0CNDanJQqq8KHOpe6GNUkbJS1JM9p+pIkuGmFfuyHs7R/XcnMvAh9+yP3XnQ9u3DXy+Yh4Qfa8AAAA=",
+  "Body": "H4sIAAAAAAAAAHXLvQ6CMBRA4Xe5M03qpX92FTZRByYXU+sFTYqYtkzGd5fG2fl85w2Xxw0sKE2qRnPVXOHghSFXi0FLAxX4sKRM8eAmWmEiF/2dbXkp8/QKlKlxuSTkKBmvGZqeS4vSbsy5qEjunxEWdTEU4xw7SsmNq3ouIVSQ8m/ZHbvTvu3bBj5fx3QTOq4AAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/sampleDatasetLoad/67e4315f977b2776f7a7972d",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/sampleDatasetLoad/67e6328b7062fc48ea34f758",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:55:52 GMT"
+      "Fri, 28 Mar 2025 05:25:21 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "40"
+      "36"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 0503164865..662071bc08 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:19 GMT"
+      "Fri, 28 Mar 2025 05:16:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json b/test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
index 9f9493f59a..3b6194d8a3 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_67e632c17062fc48ea34f86f_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhbmFseXplciI6Imx1Y2VuZS5zaW1wbGUiLCJjb2xsZWN0aW9uTmFtZSI6Im1vdmllcyIsImRhdGFiYXNlIjoic2FtcGxlX21mbGl4IiwiaW5kZXhJRCI6IjY3ZTQzMTk5YWRiYTY1MTNhOGM2M2ZiNSIsIm1hcHBpbmdzIjp7ImR5bmFtaWMiOnRydWV9LCJuYW1lIjoiaW5kZXgtMTE2Iiwic3RhdHVzIjoiSU5fUFJPR1JFU1MiLCJzeW5vbnltcyI6W10sInR5cGUiOiJzZWFyY2gifQ==",
+  "Body": "eyJhbmFseXplciI6Imx1Y2VuZS5zaW1wbGUiLCJjb2xsZWN0aW9uTmFtZSI6Im1vdmllcyIsImRhdGFiYXNlIjoic2FtcGxlX21mbGl4IiwiaW5kZXhJRCI6IjY3ZTYzMmMxNzA2MmZjNDhlYTM0Zjg2ZiIsIm1hcHBpbmdzIjp7ImR5bmFtaWMiOnRydWV9LCJuYW1lIjoiaW5kZXgtNzM5Iiwic3RhdHVzIjoiSU5fUFJPR1JFU1MiLCJzeW5vbnltcyI6W10sInR5cGUiOiJzZWFyY2gifQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes/67e43199adba6513a8c63fb5",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90/fts/indexes/67e632c17062fc48ea34f86f",
   "Headers": {
     "Content-Length": [
       "217"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:55:54 GMT"
+      "Fri, 28 Mar 2025 05:25:24 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "85"
+      "66"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_1.json
index ce7265c53a..434e1d4f87 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniMEQm7B26t4urToc9vGhGBvZJh0i/ntJo6ZlqVg839O7J53uSqSefUD3ZGcTSJ0lRDqEgIrUhGXsmGZFyvhLzutS1PnpjSRkuM24wJK1p/IkRMOE4K0AURVVvs71YM6e1O9X0jtsV7YPYfI1pVLbWaUKL4fRms6q5iDtSGEaKAQNnl4Y7ZydJ0//sTvUq9KjbsmSRFhBpTUBBoPOP7Zt7BvzHzhSzf08u1p+0DglCgI04PHV78vZ8nGaJtzXcuciNTgr0Xvc1fFg47R89kNAPfiwo+WXXT4SYmDE778CJ/sUGaacrRLruufbux+xVcArBkXLUDEUSnGpsCTLF09A8mVCBAAA",
+  "Body": "H4sIAAAAAAAAALWTPU/DMBBA/8vNSe06n3hlYocFxHC1Lx/CiSPbKUOV/05KRSELyuL5nt496XQXUGb2gdyjnccAkiegHGEgDRIEF0XKs1TUz7yQx1Jmx1dIoL/OyorKjKOueCkaldeEWU5Y8HVu+vHDg3y7QOeoWdkuhMlLxpSxs041nQ+DHVurTwdlB4ZTzzAY9OwsWOvsPHn2j92RWZWeTANLEmEFU3YM2I/k/H3bxr4x/4Ej1dzOs6vlB41TojHgCT29+H05Wz5O00T7Wm5cpAZnFXlPuzrubJyWz64PZHofdrT8sst7AiMO9P1X6FSXkqA0qx5Wi3Xt0/XfC2o0lrXArBGkBVVal0pTDssX5Vim3UMEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "282"
+      "281"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:47:16 GMT"
+      "Fri, 28 Mar 2025 05:16:28 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "3154"
+      "2702"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_1.json
deleted file mode 100644
index 9eb744a56f..0000000000
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPTXxJG6d+c5OsyJBLEbvt1mEoZJtJtMqSIckZ0iL/PipKuzTDir20DwZskTw8FHnoJ0LLNRUFlH0pFmzZKGqYFCR+IkWjjaxmNQiteZ/VK1DOJ+M6CEn8/ccJqZhgVVMNBc05lGi4UtLIQnISk2ycBvchOSGG68PwiSwBzYPh5+R6nJHtCclp8dDUexASLyjXgKcM/QUURipLB47MCmh5pWABCpA+AmoopCip2ljIgiN7UNmmtqb58Go86ifpMEM6hUPFKlOjmFhqRLcRCGhggA8GhH541vI7rbCbBd34NIpD/w5DS6YfUvYIlxck7vht353cUoX38FzX5+vx+Nv9bTKfDAcYguTUprbZEjMHbfCC1qwELIlMZ9Mheiy5zCnvO8Ip8MWECrqEMl1RVSLuS8VLJZt6hDdAuhGchovz0/MoysMo6i4iGvU6vQDR2IG9R8ucds+CDu0V3TCPIrRzmgPXrnuciQf7+kRWeJEYtzKm1rHnFVw2ZauEdbuSYinLvF3IyqM186jhVHvr0NuR0d6/mHj7BmhPA1XFqtULLDsFfNcpvsAmfVBaz42Xp/D2pYIvMtcvTF5lfpX10PvDqWpBa72S5n+I/vHdWkFay+BiQn9KdYPgOy2TXtsnL7ZXx+0uGgStnIAOOlXTRh+orWbmWJ8Kas6K3bpIayjcIL0xft0zm6qpdnON3oGFWGK0WwsuHkefbwwr9B4SEYU2dkFZ3SH2JPD3QhzNrlIrQx9lCLm+kbypYC/4NEumg2RuBShQln3ZCENiH2VOGyPTgvKdsHDJyapurOT/XjC1gpLhnljDceUa42Egf4nXhq3jZZfDMdoWbcBx69jD9yits7WEmVTMbEgc2Q+3Z6aut8ltStzOnAm+ea/Ldf3cp7xO74dJmt0Hu8F8lAJGbwxHSZzPPvgOXz+5SCWl6YMy++yjdH45n82yr3ZKkb15DunPh0k2ml7aPw7YjbwbTftDctv+uItrp4M59oVqSDcoxgphxllKtr8BD8RcYRcHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "788"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:20 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "579"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_1.json
new file mode 100644
index 0000000000..b07e10e76e
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPTew4S9r5zU3SIkMuhe22W4chkG0m0SpLhiRnSIv8+6jIvSTDir20DwZskTw8InnoR0KLDRU5FAMplmxVK2qYFCR8JHmtjSznFQit+YBVa1DOJ+W6E5Dwx88TUjLByrocCZpxKNBwpaSRueQkJOkk6SwCckIM16/Dp7IANA9HF9H1JCW7E5LR/L6uGhASLinXgKcM/QXkRipLB47MCmhxpWAJCpA+AmrIpSio2lrInCN7UOm2sqZ4dDUZD6JklCKd3KHiLROjmFhpRLcRCGhgiA8GBH7Qa/ndVnCW+r2w0w+7wR2GFkzfJ+wBLs9J2PXbvju5pQrr8HSvi+vJ5PviNoqnoyGGIDm1rWy2yMSgDRZowwrAK5HZfDZCjxWXGeUDRzgBvpxSQVdQJGuqCsR9vvFKyboaYwVI/xT6XZ8Wp34/WOafz4B2PwPt+YjGXuyZf2iHHto5zYBr1z3OxL19fSRrLCTGrY2pdOh5OZd10Spg0y6lWMkia+ey9GjFPGo41d4m8PZktPcvJl7TAO1poCpft75Ycgr4vlF8iT36mKyeGy5PYe2lgq8y089EDhIfJH3t/dFMtaCVXkvzPzxffHdWjdYyPJ/SX1LdIPZeyOSsbUvf2A6O2300CFo69by0qaK1fqW0ipljbSqoOMv3qyKpIHdD9MboFV2bqS73M43eHQuxwmi3Elw8jj3fGpbrBhIRhTZ2OVnNIfa04zciHM+vEitBHyUImb6RvC6hEXuSRrNhFFvxCZTkQNbCkNBHidPayCSnfC8qXHCyrGor97+XS6WgYLgjNnB8c43xMJS/xaFh53jZxXCMtkMbcNw49vA9rtbdWcJMKma2JDy1H27HzFxro9uEuH05F3z7XsV1/WxSXieLUZSki85+Lh+kgPEbw5ER59ME3+HrJxeppDQDUKbJPk7iy3g+T791MALZm6eQQTyK0vHs0v5twG7j/Wjan5Hb9Mdd3DgZxNgXqiHZohRLhJmkCdn9AR8ZgC8TBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "777"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:32 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "554"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_1.json
index 2a78f42606..f930abd63e 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAACWOyw6CMBRE/+WucdEgVVhrDBs0sDSGXErRJn2FFkND+HcLbueczMwCzEjJmRdGV6g4FKDMV3AHCfTosUO3ZQ6VlbxVgxRzJEL3fC4vEdATP6Ykz7HvkGYkxTOj6dBlUVJordBvB8UCfdCoBIPCjxNfE9D/qb3nQAiNuvPopyhDWbWP+n6rr02zxUEbHVQEz1cCPtj9DseRfWD9AdHnkaq+AAAA",
+  "Body": "H4sIAAAAAAAAACWOwQ6CMBBE/2XPmKiQgpw1hgsaOBpD1rLVJrQltBgawr9b8DrvZWZm4KbriDtpdImKIAdlvpIsRNCiwxfaNbOo+o4aJTo5BSJ1S1NxDoClxOIjP6R7dhQ8yQjjRGRMBElh30v9tpDP0HqNSnLI3TDSEoH+T209uzQ+Bd06dGOQoSibe3W7Vpe6XmOvjfYqgMczAuf77Q7hwD+w/ABhYAQAvgAAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "174"
+      "175"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:55:53 GMT"
+      "Fri, 28 Mar 2025 05:25:21 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1308"
+      "2449"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_2.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_2.json
similarity index 61%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_2.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_2.json
index ff6741adfc..86d059a5a7 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_2.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAIVQTUsDMRD9L3Ou4lJdtbeiIr1Uab2JlGky2w0ksyGZoLH0v5tdYT1Y2tswb97X7AEZbf6mADOwSRHTZRRkjUHDBFRnLSkxHS/RUTnxFpkkFkij4BZjv4zovKXNLhlNPWRY09fisSD1LV1Pq/st6i3WN9UU71Q9bfRVOXLoveFdhNkedGZ0RsGsQRtpAo0hqwfEoeG5uC76lgL1m5N5JfshkIQiDYcJ8BD7GOuzNULRo6I+TLJiBr+8JtX1cnk+Uo7Rm0Cs2v+WhyMhYgpN8Xkj5ymgpEAPZ5uML5GQaNTUnUqOWIrPWO733RdVVRdaJAyqnZ9SLqOk8lxYLDevq5fn1dN63a8zd5xdAd4//joMcnD4AUBvJI0nAgAA",
+  "Body": "H4sIAAAAAAAAAIVQTUsDMRD9L3OuIm1pa29FRXqp0noTKWMy2w0ksyGZoLH0v5ussB4s9TbMm3lfR0BGm78owBJsUsR0HQVZY9AwAtVZS0pMxxt0VE68RSaJBdIo+I6xLiM6b2l/SEZThQxr+lzfF2Q2p9lkrKbzm9m4UdMF4WTaLPC2HDn03vAhwvIIOjM6o2DZoI00gsaQ1T3i0PBKXBd9S4Hq5qJfyb43JKFQw2kE3Ns+9/XRGqHoUVE1k6yYXi/vSHWVLq+Gl3PvTSBW7V/J0xkTMYWm6LyQ8xRQUqC7f5MMlUhINHDqTiVHLEVnCPdT99V8UluNhEG1q0vMZZRUyoX1Zv+8fXrcPux2dZ254+wK8Pr2m6Gng9M3EEkZhicCAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "294"
+      "293"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:55:55 GMT"
+      "Fri, 28 Mar 2025 05:25:24 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2453"
+      "1462"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_3.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_3.json
similarity index 57%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_3.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_3.json
index 084a01558a..be7f944b44 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_3.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAK1T3U/CMBD/X/o8TRCZyBvxKyQGDTwaQm7twRq6dmk7sZL97/YGDEUlMfFpW+/3dXfdhoEGFd7RsgFTFUeN586DFmAFS9qiY4OXDeM52Hup/PZ7ljANBUbeCsPaWPFo1mhvwGEkerNCfcBumA8lQRVhOGHq2Q4lG/MWsRNjdZ387riP+D+WbcM1IbhRCrmXRo+3ZqVx3kUDAR4y0okMKEqFc29BaqmXsSi1wLfRbaylV3jZ7VwLEBmkvU4X+jztLrAfQQWUZYQ78hYh9iI5GyxAOUzYQqISTSUzItDz+2bWufToSuDUb1EpLwlXhClyQx2EYUv5Qv9pQfvWLeWPwz4+oUEUBWrfZDqkg8rn5u8GyYm2nKRp0hCX2lgcZuY1Ui96vRMxheEVpSNlD9uRflL+8YIcadXtdWqWd9bppBHlECzPh6f+ivjqq+jIRuP58+TpYXI3ndJx0EaHYndT926NHKs/AOUT7LBpAwAA",
+  "Body": "H4sIAAAAAAAAAK1T3U/CMBD/X/o8jeFjIG/Er5AYNPBoCDnawzV07dJ2YiX73+0NGIpIYuLTtt7v6+66DQMNKnygZQOmSo4aL50HLcAKljRFxwYvG8YzsPdS+e33LGEacoy8FYa1seLRrNHegMNI9GaF+oDdMB8KgirCcMJUsx1K1uYNYifGqir53XEf8X8sm4YrQnCjFHIvjR5vzQrjvIsGAjwsSCcyIC8Uzr0FqaV+jUWpBb6PbmMt7WHabvG0d5W2lrzTR2h3ln3eiaAciiLCHXmLEHuRnA2WoBwmbClRibqyMCLQ8+dm1pn06Arg1G9eKi8Jl4cpckMdhGFD+UY/taB965byx2Efn9Ag8hy1rzMd0kHpM/N3g+RMW07SNGmIr9pYHC7MW6S2ut0zMYXhJaUjZQ/bkX5RPnlBjrSq5jrVy7vota8jyiFYng3P/RXx1ZfRkY3G8+fJ08Pkbjql46CNDvnupu7dajlWfQJfOMCMaQMAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "375"
+      "376"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:55:57 GMT"
+      "Fri, 28 Mar 2025 05:25:26 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2585"
+      "1247"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_4.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_4.json
similarity index 64%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_4.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_4.json
index 213194eaea..951cc37997 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_4.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_clusters_search-90_fts_indexes_4.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAH2PQUsDMRCF/8uct8Wy7Vr2JijSS5X2KKVMk1kNJJMlyYJxyX930qJ48hbe+8j7ZgZktPmLAvRgJ0VMy5iQNQYNDShvLalkPO/RkSCjjylKoTHhBWONIrrR0jkFNGz4XUrDmj53j9J197RuV3iH+oLdZtXiVnXtMGwFcjiOgkfoZ9CZ0RkF/YA2UgODIauvjfLOEctk//YHS2ESKuWx7muvpspAaeafLKZQVcqplAb4pn61WmAImBfrTgwiYVAfD//dL880yTjs9ufXw8vz4el4rHFmz9lVq9Ovx+07KN8nbFkLUwEAAA==",
+  "Body": "H4sIAAAAAAAAAH2QwWrDMBBE/2XPTkli7BjfCi0ll7QkxxLCVlq3AmllJBmqGv97VwktPfUmZh6ax86AjDZ/UYAe7KSI6S4mZI1BQwXKW0sqGc8HdCTI6GOKUmhM+IaxRBHdaOmSAho2/C6lYU2f+wfp2h219VZ1Tddu2s22Wbf1UO90J5DDcRQ8Qj+DzozOKOgHtJEqGAxZfW2Ud45YJvvXP1gKk1Apj2VfezUVBpZq/sliCkVlOS9LBXxTv1qtMATMq2bdiEIkDOrj/r8DyDNNsg77w+Xl+Px0fDydSpzZc3ZF6/wrcvsOlm//ENDUVAEAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/clusters/search-90/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "241"
+      "244"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:56:00 GMT"
+      "Fri, 28 Mar 2025 05:25:28 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1005"
+      "2528"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_search-811_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_search-90_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_search-811_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_search-90_1.json
index 5bf4719724..f3b95ab991 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_search-811_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e630ad7062fc48ea34ea50_sampleDatasetLoad_search-90_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2LvQrCMBCA3+VmA03a5GxmQUSsIILgImd7VSG1ckkn8d2NiK7fzxNOtw48OOSq1LavEc8G0fVIWKPpYAZtmGJiaWjgHEYmaa9qrvVHjcMjcOIFpezuUwiZCdOPgCmMVUWpjNtr523lrT3mj0VG2XCMdPl/MX2Xw3a3XjVLeL0BWdLzkZsAAAA=",
+  "Body": "H4sIAAAAAAAAAD2LSwrCMBBA7zJrA2HSfMxaEBEriCC4kRinVUitTNKVeHcjotv3ecLpdgEPxpJR6M5WGuxi4yioprPawQximnIhbsNANcwUOF7FXH7MODwSFVqEUtV9SqkypvAjgBK1kEqg20vtsfFoj/Uj5pE3lHPo/18u3+Ww3a1X7RJeb+J4oFSaAAAA",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/sampleDatasetLoad/search-811",
+  "Path": "/api/atlas/v2/groups/67e630ad7062fc48ea34ea50/sampleDatasetLoad/search-90",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "146"
+      "144"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:54:55 GMT"
+      "Fri, 28 Mar 2025 05:24:27 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "79"
+      "95"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/memory.json b/test/e2e/.snapshots/TestSearchDeprecated/memory.json
index ce5e4dea84..70ec682114 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/memory.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/memory.json
@@ -1 +1 @@
-{"arrayRand":"Lg==","rand":"dA==","searchGenerateClusterName":"search-811"}
\ No newline at end of file
+{"arrayRand":"Afk=","rand":"AuM=","searchGenerateClusterName":"search-90"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json b/test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
rename to test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
index 25a85c1e78..61c843bc9a 100644
--- a/test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
+++ b/test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34d05f/serverless/cluster-548",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:19 GMT"
+      "Fri, 28 Mar 2025 05:07:38 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "360"
+      "317"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
deleted file mode 100644
index 28977450e9..0000000000
--- a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVUW4vaQBT+L/OwL1Vj1EQJSNE1XSyLlY3dlpayjMlJHExmwlzCbsX/3jOJ7hqh0KftQ2Ay37l85/LNgeSM7xUJfh7ITkJKArLTulSB48S5MEk3gapXCJ6JZNuLReHQkjlU51Q51cDJpDClcvwxjAaJP6TJlvqeO6ST2EtjP3YUyApkDkp9ZDzOTQK3wnA91dLATUkzWJli6t4wDYVag1zjzdTt90mHSMiRioI8Jcdf9leZXDc0Y8E5xJoJHmnJeIa3B6I05QmVSSQr9DsR/qBkVRdilAbZHY96z0XmvcSjc0V1dRw0OXZILIFqWOCHAQb9gdftD7sDf+P6wXAceJMfyKqud5mgwd9KRiN2gfstPKG2tPdp+EXVV+3svFtiZ0vjvSkdnJ4WEj6LrXrl0srdyntp/R/IKk5LtRP6X6i+2dolrZHF/BGkwuVEx0mv3/MxDKeFXarWREopKpaAjEDr8xJbBnhen6BV4zb7FqE9pKld+goWTO0j9hvu5vesYJoE3gW45FYIMViDk/un+/D7pf9V9E24mq02liQ863ndgmsNjFsaKNv+UfjwGD7ch1FU9yvDyk/I1+gpnEWbJxcBDZzyU/iQ020OKBL7CqDw3qbR4F9Kq+1G1a/QreDYJiOMugqS0lzVUTSyPmdeL2ab5erOJqZZo7U9vCACvMLLiubG2sEA6sHhUArGqU2L3dHN43KVwZoJTfP6ASOBe/wDOreRNDoFAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "563"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:18 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "168"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasLegacyServerlessInstanceDescriptionResource::getAllServerlessInstances"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_1.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_1.json
new file mode 100644
index 0000000000..c7cd278ae9
--- /dev/null
+++ b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAMVUW4vaQBT+L/OwL1Vz0WTTgBRd08UiVjZ2W1rKMiYnOpjMhLmkF/G/90zUXRUKfdo+BCbznct3Lt/sSMn4VpH4245sJBQkJhutaxU7TlYKk3dzaHqV4GuRr3qZqBxaM4fqkiqn8Z21FKZWTngLoQ9RcOuGfpENIqD9Qe4GhaNANiBLUOod41lpcrgThuuhlgZuarqGuamG3g3TUKkFyAXeDD3XJR0ioUQqCsqC7L/bX2VKfaCZCc4h00zwVEvG13i7I0pTnlOZp7JBvyPhN0o2bSFGaZDdYBD1VobVP+jmVFJbHgdN9h2SSaAaJvhhBN/1g67b7/rR0g1i9zb23a9Iqy14mqPB32pGI3aGR0EUeqHnB27YL9zC6yP+Oh0/L/uqoZ3Xy+ysaLY1tYMD1ELCB7FSz2Qukl8kPrf+H2wVp7XaCP0vXF9s7aK2yGT8CFLhgqJj1HN7IYbhtLJ7dTmUWoqG5SBT0Pq0yZYCnhdHaH7wG31O0R6Kwm5+AxOmtin7DffjGauYJnFwBk65VUMG1uDo/n6WfDn3v4q+TOaj+dKyhJ963PbgWgdvL3RQX/qnycNj8jBL0rRt2BpLPyKf0qdklC6fPAQ0cMqP4RNOVyWgUOxTgOJ7mccB/1hbgR+k/QzdCY5tMsKoqyAFLVUbRSPrU+bFZLSczu9tYro+6G0LvxAB3uBlQ0tj7cCHdnI4lYpxatNid/ThhbnKYM2EpmX7ipHY2/8BpgjAVD8FAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34d05f/serverless",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "572"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:37 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "90"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasLegacyServerlessInstanceDescriptionResource::getAllServerlessInstances"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
similarity index 51%
rename from test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
rename to test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
index 1437bcac0b..83e20d4403 100644
--- a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
+++ b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVU0W7aQBD8l3sGDkxskN8guBERIhV20ypRFJ3Pa3PCvrPuzlZbxL9nbayCkSr1KX1AspjZnfHujo+EKymBW6FkaLWQmSH+8TQgXAOzsMIf8YkzdtzheDp0vGji+dOZ785fyIBkWlXlOkGCN4M7J/GmLImZ506mbM7dlHscSeIK93p4wsaI50IeUPP1SPYaUuTurS2NTynPVZUME6hHhZKZSuIRVwVlpaDM5szQ2qGtAUP/pk4N6Bp0DsZgt8pY0MPZHWpqyFHIQJ6S0+DThGnM+KEqqQZjlYZHFZs/XnraPd1r9n8wayQrzV7Zf7F64Z7eBqRFVstn0AaPCwvno/HIwzaSFc1R9TZSalWLBHQI1nZHSBoH+Py1g7bnssX3EPmQps3R1rAS5hCK3/Cw3IhCWOK7V+BaGsskh4bQlX/ZBD+u62+6R8F2sY0ak/DTLtsR3GZg1stA2a8Pg91zsNsEYdjOK8M375Bv4XuwCKP3CQIWJJNd+0CyOAcMidUVYPAu2zjjT2WTzXYgF+heSRxTpSpz0yRluWm7WHTdKd/vgkW03j40wiw7Z+0AvxABWeOfNcurhmfx0trN4VYKIVmji+Ox56/DjcQHCtzfszkEAAA=",
+  "Body": "H4sIAAAAAAAAAMVU0a6aQBD9l31Wd0VBypte6Y2NsY3Q26ZNc7PCgBthl+wupK3x3zsgqWLSpE/tgwnxnJlzmJnDmSRKSkisUDKyWsjckOB8GZFEA7ewxh8JiMMcd8xmY8ePmRuwReCwL2REcq3qapMiwVuA54DvLpjnZMncBz6bp8zNkCTucN/1vak3dVzmzTKWTWeIF0KeUPPrmRw1ZMg9WluZgNKkUHU6TqGZlErmKj1MElVSXgnKbcENbRzaGTD0T+rUgG5AF2AMdquNBT125z6KaihQyUCRkcvo3ynTA09OdUU1GKs0vFMH89vMQHwgfM/+H26N5JU5Kvs3Xm/cy7cR6ZD16gW0wfvCQn/CJh62kbxs72q4lEqrRqSgI7C2P0TSWsDnDz20u9YtP0XIhyxrD7eBtTCnSPyE59VWlMKSwL0DN9JYLhNoCX352234+b7+oXsc7pa7uHUJ3+2qm8FjDt4MclAN66Nw/xLut2EUdQPL8dV75GP0Gi6j+HWKgAXJZd8+lPxQAAbF6howfLd9XPH3VZvPbiA36ElJHFOtavPQJOOF6bpYdN0rP+3DZbzZPbfCPL/m7QQ/EAHZ4J8NL+qWZ/HWutXhWkoheauL47HXL8SDxC+FZ+IxPQQAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34d05f/serverless/cluster-548",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "476"
+      "484"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:59 GMT"
+      "Fri, 28 Mar 2025 05:07:20 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_2.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_2.json
similarity index 50%
rename from test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_2.json
rename to test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_2.json
index 05a5e6b06d..84425c2c39 100644
--- a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_2.json
+++ b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVUXY+bMBD8L35tghMSSMRb0tAqVZRWR3qtWlUnYxZiBWxkG3TX6P57l4/eQaRKfWofkBAzuzNe73AlXEkJ3AolI6uFzAwJrsRYJhOmk0jXJCCFkplK4jdG1wGlPK+MBT1dLZ3HIvOe+NLpCdMEakeCJc8TwjUwCzt8sIE7c73pbDF1/dPcDxarwFt/IxOSaVWV+wQJ/gqWbuIvWBIz35sv2Jp7Kfc5ksQA90d4wmaI50Je0PP3KzlrSJF7trY0rU9VJa2l3p7DVUFZKSizOTO0dmlrwNA/qVMDugadgzGDU6OmhhyFDOQpHvWfCdOY8UtVUg3GKg0fVGxevIy0R7pD9n8wayQrzVnZv7H6yn3+Mem2bre9B21wObFw7cwcH9tIVjRLNbqRUqtaJKAjsPb3EjcO8P1TDx27ss2XCPmQps3S17AT5hKJn/B+exCFsCTwBuBeNkHg0BD68neH8Ouw/qb7KTxujqfGJDzabTuC2wysRhkox/VReHcf3h3CKGrnleHJe+Rz9BBuotPDHAELksm+fShZnAOGxOoKMHivt9HhH8sm212qX6C3SuKYKlWZmyYpy03bxaLrXnm/O4SNKMu6nF3gCb+CrPFjzfKq4VjcsvbW8EYKIVmjiaOx3Z/lpv0vBe/xr3UEAAA=",
+  "Body": "H4sIAAAAAAAAAMVUXY+bMBD8L35tAoQEQnlLGlqlitLqSK9Vq+pkYCFWwEa2oR/R/feugd5BpEp9ah+QEDO7M17vcCWp4BxSzQSPtWS8UCS8EqUpz6jMYtmSkFSCFyJLXijZhradlo3SIOfeKrCShtXf6NkaGPMMWouDJo8zkkqgGnb4YAfXcb25s5y7wcnxQmcdus5nMiOFFE29z5Dgr8F3IfDWju/m6SoAulxljpcjiY3wwAv8hb9wPcdf5k6+WCJeMn5B01+u5CwhR+5Z61p1RkWTdZYGe1YqKpvWzKa6pMpuXbszoOw/qdsKZAuyBKXGx0ZRCSUqKShzPOu/U7YTml6a2pagtJDwViTqycxEfCI8Zv8Pt4rTWp2F/huvz9zHr7N+83bbe5AKFxQLA8uxfGzDaWX2anoptRQty0DGoPXvTTYW8P39AB37us3HGPmQ52bzW9gxdYnZT3izPbCKaRJ6I3DPTRpSMISh/PUh+jSuv+l+io6b48m4hO96283gNgcvJzmop/VxdHcf3R2iOO4GVuDRB+RD/BBt4tPDAgENnPKhfcRpUgIGRcsGMHzP99Hj72oT8D7aT9ArwXFMjWjUTZOclqrrotH1oLzfHSIjSos+axf4gV+Bt/ixpWVjOBr3rLs2vJKKcWo0cTS6/73ctP8FmxM2Q3oEAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34d05f/serverless/cluster-548",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "503"
+      "512"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:16 GMT"
+      "Fri, 28 Mar 2025 05:07:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "45"
+      "43"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_3.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_3.json
similarity index 50%
rename from test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_3.json
rename to test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_3.json
index cc9408f645..356540993c 100644
--- a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_3.json
+++ b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVUXW+bQBD8L/daG2xssMWbXdPIleVGgaZVqyo6jgWfDHfo7kBJrfz3LB9JwFKlPrUPSIiZ3Znb2+FCmBQCmOFShEZxkWniX4g2VCRUJaGqiU8KKTKZxB+0qn3bZnmlDajpamk9Fpn7xJZWT5gmUFsCDHmeEKaAGtjhgw2cmeNOZ4up40Vzz1+sfHf9g0xIpmRV7hMkeCtYOom3oElMPXe+oGvmpsxjSOID3BvhCZ0hnnNxRs8/L+SkIEXuyZhStz5llbSWensWk4VNS25Tk1Nt147dGtD2n9RtDaoGlYPWg1OjpoIchTTkKR71nwnbMWXnqrQVaCMVfJaxfvMy0h7pDtn/wawWtNQnaf7G6jv3+dek27rd9h6UxuXEwrU1szxsI2jRLNXoRkola56ACsGY1yVuHOD7bQ8du7LNtxD5kKbN0tew4/oc8t9wsz3wghviuwNwL5ogMGgIffmnQ/B9WH/VPQqOm2PUmIRHs21HcJ2B1SgD5bg+DO7ug7tDEIbtvDI8eY98DR+CTRg9zBEwIKjo2weCxjlgSIyqAIP3fhsd/qVsst2l+g36KAWOqZKVvmqS0ly3XQy6flW+3W2i/fGmEaZZl7UzPCECosaPNc2rhgcOtBeHl1JwQRtZnI7pfi5XCi9VU4AqeAQAAA==",
+  "Body": "H4sIAAAAAAAAAMVUXY+bMBD8L35tAoQEQnlLGnpKFaWng16rVtXJwEKsgI1sQ3uN7r93+bg7iFSpT+0DEmJmd8brHS4kEZxDopngoZaM54r4F6I05SmVaSgb4pNS8Fyk8RslG980k6JWGuTcWXlGXLPqBz0ZA2OeQmNw0ORpRhIJVMMOH+xgW7Yzt5Zz24ssx7fWvm19JTOSS1FX+xQJ7hpcGzxnbbl2lqw8oMtVajkZktgI9xzPXbgL27HcZWZliyXiBeNnNP3tQk4SMuSetK5UZ1TUaWdpsGckojRpxUyqC6rMxjY7A8r8k7qpQDYgC1BqfGwUlVCgkoIiw7P+O2Uzpsm5rkwJSgsJH0SsXsxMxCfCY/b/cKs4rdRJ6L/x+sp9+j7rN2+3vQepcEGx0DMsw8U2nJbtXk0vpZKiYSnIELR+3uTWAr7fDtCxr9t8DpEPWdZufgM7ps4h+wU32wMrmSa+MwL3vE1DAi1hKH9/CL6M66+6R8Fxc4xal/BTb7sZXOfg7SQH1bQ+DO7ug7tDEIbdwHI8+oB8Ch+CTRg9LBDQwCkf2gecxgVgULSsAcP3eh89/rFqA95H+wV6JziOqRa1umqS0UJ1XTS6fla+3W2i/fGmFaZ5n7czPCICvMGPDS3qlgc2dDeHt1IyTltZnI7u/zBXCr8B4T8EYH0EAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34d05f/serverless/cluster-548",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "505"
+      "515"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:18 GMT"
+      "Fri, 28 Mar 2025 05:07:37 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "58"
+      "33"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json b/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
deleted file mode 100644
index 31cd2e3a6e..0000000000
--- a/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "Body": "eyJjb25uZWN0aW9uU3RyaW5ncyI6eyJzdGFuZGFyZFNydiI6Im1vbmdvZGIrc3J2Oi8vY2x1c3Rlci03NC54bWc1eWM0Lm1vbmdvZGItZGV2Lm5ldCJ9LCJjcmVhdGVEYXRlIjoiMjAyNS0wMy0yNlQxNjozNzo1OFoiLCJncm91cElkIjoiNjdlNDJkNjNhZGJhNjUxM2E4YzVmYzZjIiwiaWQiOiI2N2U0MmQ2NmFkYmE2NTEzYThjNWZkYTAiLCJsaW5rcyI6W3siaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlNDJkNjNhZGJhNjUxM2E4YzVmYzZjL3NlcnZlcmxlc3MvY2x1c3Rlci03NCIsInJlbCI6InNlbGYifSx7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTQyZDYzYWRiYTY1MTNhOGM1ZmM2Yy9zZXJ2ZXJsZXNzL2NsdXN0ZXItNzQvYmFja3VwL3Jlc3RvcmVKb2JzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9yZXN0b3JlSm9icyJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlNDJkNjNhZGJhNjUxM2E4YzVmYzZjL3NlcnZlcmxlc3MvY2x1c3Rlci03NC9iYWNrdXAvc25hcHNob3RzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9zbmFwc2hvdHMifV0sIm1vbmdvREJWZXJzaW9uIjoiOC4wLjYiLCJuYW1lIjoiY2x1c3Rlci03NCIsInByb3ZpZGVyU2V0dGluZ3MiOnsiYmFja2luZ1Byb3ZpZGVyTmFtZSI6IkFXUyIsImVmZmVjdGl2ZURpc2tTaXplR0JMaW1pdCI6NSwiZWZmZWN0aXZlSW5zdGFuY2VTaXplTmFtZSI6IkZMRVgiLCJlZmZlY3RpdmVQcm92aWRlck5hbWUiOiJURU5BTlQiLCJuZXh0QmFja3VwRGF0ZSI6IjIwMjUtMDMtMjdUMTY6Mzc6NThaIiwicHJvdmlkZXJOYW1lIjoiU0VSVkVSTEVTUyIsInJlZ2lvbk5hbWUiOiJVU19FQVNUXzEiLCJ0ZW5hbnRCYWNrdXBFbmFibGVkIjp0cnVlfSwic2VydmVybGVzc0JhY2t1cE9wdGlvbnMiOnsic2VydmVybGVzc0NvbnRpbnVvdXNCYWNrdXBFbmFibGVkIjpmYWxzZX0sInN0YXRlTmFtZSI6IlVQREFUSU5HIiwidGFncyI6W3sia2V5IjoiZW52IiwidmFsdWUiOiJlMmUifV0sInRlcm1pbmF0aW9uUHJvdGVjdGlvbkVuYWJsZWQiOmZhbHNlfQ==",
-  "Status": 200,
-  "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
-  "Headers": {
-    "Content-Length": [
-      "1144"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:17 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "457"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasLegacyServerlessInstanceDescriptionResource::updateServerlessInstance"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json b/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
new file mode 100644
index 0000000000..1bafc71771
--- /dev/null
+++ b/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_cluster-548_1.json
@@ -0,0 +1,47 @@
+{
+  "Body": "eyJjb25uZWN0aW9uU3RyaW5ncyI6eyJzdGFuZGFyZFNydiI6Im1vbmdvZGIrc3J2Oi8vY2x1c3Rlci01NDguYnVpcHdhaC5tb25nb2RiLWRldi5uZXQifSwiY3JlYXRlRGF0ZSI6IjIwMjUtMDMtMjhUMDU6MDc6MjBaIiwiZ3JvdXBJZCI6IjY3ZTYyZTg1NzA2MmZjNDhlYTM0ZDA1ZiIsImlkIjoiNjdlNjJlODg1ODYxNjEyNTA2M2YwZjEzIiwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTYyZTg1NzA2MmZjNDhlYTM0ZDA1Zi9zZXJ2ZXJsZXNzL2NsdXN0ZXItNTQ4IiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlNjJlODU3MDYyZmM0OGVhMzRkMDVmL3NlcnZlcmxlc3MvY2x1c3Rlci01NDgvYmFja3VwL3Jlc3RvcmVKb2JzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9yZXN0b3JlSm9icyJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlNjJlODU3MDYyZmM0OGVhMzRkMDVmL3NlcnZlcmxlc3MvY2x1c3Rlci01NDgvYmFja3VwL3NuYXBzaG90cyIsInJlbCI6Imh0dHBzOi8vY2xvdWQubW9uZ29kYi5jb20vc25hcHNob3RzIn1dLCJtb25nb0RCVmVyc2lvbiI6IjguMC42IiwibmFtZSI6ImNsdXN0ZXItNTQ4IiwicHJvdmlkZXJTZXR0aW5ncyI6eyJiYWNraW5nUHJvdmlkZXJOYW1lIjoiQVdTIiwiZWZmZWN0aXZlRGlza1NpemVHQkxpbWl0Ijo1LCJlZmZlY3RpdmVJbnN0YW5jZVNpemVOYW1lIjoiRkxFWCIsImVmZmVjdGl2ZVByb3ZpZGVyTmFtZSI6IlRFTkFOVCIsIm5leHRCYWNrdXBEYXRlIjoiMjAyNS0wMy0yOVQwNTowNzoyMFoiLCJwcm92aWRlck5hbWUiOiJTRVJWRVJMRVNTIiwicmVnaW9uTmFtZSI6IlVTX0VBU1RfMSIsInRlbmFudEJhY2t1cEVuYWJsZWQiOnRydWV9LCJzZXJ2ZXJsZXNzQmFja3VwT3B0aW9ucyI6eyJzZXJ2ZXJsZXNzQ29udGludW91c0JhY2t1cEVuYWJsZWQiOmZhbHNlfSwic3RhdGVOYW1lIjoiVVBEQVRJTkciLCJ0YWdzIjpbeyJrZXkiOiJlbnYiLCJ2YWx1ZSI6ImUyZSJ9XSwidGVybWluYXRpb25Qcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2V9",
+  "Status": 200,
+  "Method": "PATCH",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34d05f/serverless/cluster-548",
+  "Headers": {
+    "Content-Length": [
+      "1149"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:37 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "400"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasLegacyServerlessInstanceDescriptionResource::updateServerlessInstance"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_1.json
index 24a8491098..38d18caaf3 100644
--- a/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMQEg7x26t4urToc9kGsGBvZhg4R/17SqGlZKhbP9/TuSae7EmmmENE/uclGIoqMSI8QURFBWMGqvChzxl+OXJS1qJo3khF9m/EaT0zxElQLvDqW0Miqk1yuc6PtJRDxfiVnj93KnmMcg6BUGjepXOF8GJztnWoP0g0URk0hGgh0ZrT3bhoD/cfu0azKgKYjS5ZgBZXORtAWfXhs29g35j9wopr7eXa1/KBpShREaCHga9iXs+XTNI24r+XOJWrwTmIIuKvjwaZp+TzriEaHuKPll10+MmJhwO+/8jN6szbmyDDnTb2anO+fbz9fYaeANwzKjqFiWCvFpcITWb4AvsbMy0cEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW7DIBBA/4XZDgQb22Xt1L1dWnUgcDioGCzA7hD53+s0alovlRfme3r3pNNdkLRTTBAe/eQS4qRAMoBIoBBHlFBWkqqk3TNhnLT8+PCKCmSus6aFhkLHWtJQLesORFUrwvQ6t8Z9RMTfLugcQK/sOaUxcoyl9ZMqFcyHwbveq9NB+gGL0WCRrIh4prgPfhoj/scewK7KCFajpciwAkvvkjAOQrxv29g35j9wpprbeXa1/KB5SpRI4iQivMR9OVs+T9MI+1puXKaG4CXECLs67myels+zSWBNTDtaftnlvUBODPD9V2GGYNfGEiiU7NiuJh/6p+vPM9BKNB0VlaagKLRKNVJBjZYvWY9Uw0cEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:55 GMT"
+      "Fri, 28 Mar 2025 05:07:17 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2428"
+      "2066"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json b/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_1.json
similarity index 52%
rename from test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
rename to test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_1.json
index 4b99cb33bf..1a1484e5ac 100644
--- a/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
+++ b/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e62e857062fc48ea34d05f_serverless_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVU0W7aQBD8l3sGDkxskN8guBERIhV20ypRFJ3Pa3PCvrPuzlZbxL9nbayCkSr1KX1AspjZnfHujo+EKymBW6FkaLWQmSH+8TQgXAOzsMIf8YkzdtzheDp0vGji+dOZ785fyIBkWlXlOkGCN4M7J/GmLImZ506mbM7dlHscSeIK93p4wsaI50IeUPP1SPYaUuTurS2NTynPVZUME6hHhZKZSuIRVwVlpaDM5szQ2qGtAUP/pk4N6Bp0DsZgt8pY0MPZHWpqyFHIQJ6S0+DThGnM+KEqqQZjlYZHFZs/XnraPd1r9n8wayQrzV7Zf7F64Z7eBqRFVstn0AaPCwvno/HIwzaSFc1R9TZSalWLBHQI1nZHSBoH+Py1g7bnssX3EPmQps3R1rAS5hCK3/Cw3IhCWOK7V+BaGsskh4bQlX/ZBD+u62+6R8F2sY0ak/DTLtsR3GZg1stA2a8Pg91zsNsEYdjOK8M375Bv4XuwCKP3CQIWJJNd+0CyOAcMidUVYPAu2zjjT2WTzXYgF+heSRxTpSpz0yRluWm7WHTdKd/vgkW03j40wiw7Z+0AvxABWeOfNcurhmfx0trN4VYKIVmji+Ox56/DjcQHCtzfszkEAAA=",
+  "Body": "H4sIAAAAAAAAAMVU0a6aQBD9l31Wd0VBypte6Y2NsY3Q26ZNc7PCgBthl+wupK3x3zsgqWLSpE/tgwnxnJlzmJnDmSRKSkisUDKyWsjckOB8GZFEA7ewxh8JiMMcd8xmY8ePmRuwReCwL2REcq3qapMiwVuA54DvLpjnZMncBz6bp8zNkCTucN/1vak3dVzmzTKWTWeIF0KeUPPrmRw1ZMg9WluZgNKkUHU6TqGZlErmKj1MElVSXgnKbcENbRzaGTD0T+rUgG5AF2AMdquNBT125z6KaihQyUCRkcvo3ynTA09OdUU1GKs0vFMH89vMQHwgfM/+H26N5JU5Kvs3Xm/cy7cR6ZD16gW0wfvCQn/CJh62kbxs72q4lEqrRqSgI7C2P0TSWsDnDz20u9YtP0XIhyxrD7eBtTCnSPyE59VWlMKSwL0DN9JYLhNoCX352234+b7+oXsc7pa7uHUJ3+2qm8FjDt4MclAN66Nw/xLut2EUdQPL8dV75GP0Gi6j+HWKgAXJZd8+lPxQAAbF6howfLd9XPH3VZvPbiA36ElJHFOtavPQJOOF6bpYdN0rP+3DZbzZPbfCPL/m7QQ/EAHZ4J8NL+qWZ/HWutXhWkoheauL47HXL8SDxC+FZ+IxPQQAAA==",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34d05f/serverless",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "476"
+      "484"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:58 GMT"
+      "Fri, 28 Mar 2025 05:07:20 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "552"
+      "440"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/memory.json b/test/e2e/.snapshots/TestServerless/memory.json
index 25dffd66f5..777b36cac8 100644
--- a/test/e2e/.snapshots/TestServerless/memory.json
+++ b/test/e2e/.snapshots/TestServerless/memory.json
@@ -1 +1 @@
-{"clusterName":"cluster-74"}
\ No newline at end of file
+{"clusterName":"cluster-548"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_cluster-988_1.json b/test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_cluster-970_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_cluster-988_1.json
rename to test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_cluster-970_1.json
index ab5228c2e4..2ba7a202be 100644
--- a/test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_cluster-988_1.json
+++ b/test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_cluster-970_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f3b/clusters/cluster-988",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34cfeb/clusters/cluster-970",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:55 GMT"
+      "Fri, 28 Mar 2025 05:07:20 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "246"
+      "243"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_provider_regions_1.json
deleted file mode 100644
index 5a17c3b41b..0000000000
--- a/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeisrlFGkw4E3rOJgiER7qmFpU5LUh4n/fbFS1Clt9piTL+d8yUlyRIwm3xI5X0e0FxAhB+2VSqWD8ZbxLHwJ4dCIebLj4aax5TEmKcVEMSLxoYV3gmepxD0bOq2wG77a9qZl273IJnYnam90ikwqEBKngh9oCAIL2FGeyDea6LkQ+jxLlKtEBrUCka63DGqKgnBHVrOWkh2Ms9i1alRBLKcgpjriWs0mqiMBTAtLYBE6rc5DmTF12QxNpCLJFgL6A5cIORDKyIbB7OKQB0OIiF6DnLNDHSUkBp1xEax9L5ivLXSq3zARYfIRalVAS/8x099qOVOaqO+t+/54PvOG5Vb+Yj2ezOaDSuqZ1nOo1KuA2hWQqXzBlRYNPIP+eFMzKJgs5oPqTt6Rpbu9IzsVZN4sI88rWeV5Jc09jU7JkCr1G/lmd0FzJjXfTSh9r/5Dlfp/DM389YOtfmJ3Legak3bpwX3eCq6ucauZD4uP9px0GeQhxRVh+V+MHOv0C6KOOg0UBgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f3b/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "414"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "119"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..0c4c65896f
--- /dev/null
+++ b/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHKm9ToKZRTpcOANqzgYIrE91bC0KUnqw8T/vlgRdUqbPebkyzlfcpIcEKPpt0TO1wHtBMTIQTulMulgHDKeRy8R7BsJT7c82jRCnmCSUUwUIxLvm3greJ5J3O1BtwmvnZ7VbcZh+xVIqx3GsNEpcqlASJwJvqcRCCxgS3kq32iq5yLo8zxVrhI51C6IdL1lUFMUhDuyrVpGtjDOE9euUQWJnIKY6ohrWxaqIwFMC0tgMTquTkOZM3XeDE2lImkIAf2Bc4TsCWVkw2B2diiCEcREr0HOyaGOUpKAzrgI1r4XzNc2OtZvmJgw+Qg1K6Cl/5jpb7WCKU3U99Z9fzyfecNyK3+xHk9m80El9UzrOVTqdYFaFZCp/IUrLRp4Bv3xpmZQMFnMB9WdvCNLd3tHtivIollGnleyyvNKmnsanZIhVeo38s3uguZMar6bUPpe/Ycq9f8YmvnrB1v9xO5a0DEme6UH93kruLrGbasYXj7aU9JlUIQUV4QVfzFy7OMvzP5scxQGAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34cfeb/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "413"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:19 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "50"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestShardedCluster/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index b15fdcfd0e..0914647488 100644
--- a/test/e2e/.snapshots/TestShardedCluster/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestShardedCluster/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
+      "Fri, 28 Mar 2025 05:07:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_1.json
index d6af07ddbc..f811af1875 100644
--- a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxNSA3bJm6t4urTocviNYMRjZJh0i/r2gtGlZKhbme3r3JPuuTNsxRPJHN/aRVVnCtCeIhKxiIhNlmuWpkC8PsspVVRZvLGFmmUlFhcASn5SqhVKyUaCKJq/nuTX9ObDq/cpaT83MtjEOoeJcWzdiinQ5dK4/OawP2nUcBsMhWgj8IvjJu3EI/B+7JzsrA9mGTckOK7h2fQTTkw/3bSv7yvwH3qnm9jybWn7QfUoQItQQ6DVsy1nz+zQNtK3lxu3U4J2mEGhTx53dp+WzNZGsCXFDyy87fSSsh46Wu2rBI+Hx+yulJCiVqph1zp+el8MvqUGQjwLyRhAKUohSIxVs+gJpyM9NTAQAAA==",
+  "Body": "H4sIAAAAAAAAALWTu26EMBBF/8U1rIl5hnar9EmTKMVgXx6Kwcg2m2LFvwe0ySY0EQ31HJ05kj1XJvXkPOzZTINnZRQwaUEeipVMRCINozgUxXOUllFePjy+soB16yzLkQkUaR5lopZJAYoTWaNa5robPhwr366stagXtvV+dCXnUptJhQqXU2+GxqjqJE3Paew4eU2OXwRvrJlGx/+xW+hF6aBrNgcHrODSDJ66Adbdt23sG/Mf+KCa2/PsavlBjylR5Kkihxe3L2fLH9M0Yl/LjTuowRoJ57Cr484e0/LZdh66c35Hyy87vwdsoB7rXbVkFdT5+yuFEAhFutiMbZ7Wu09RK8oKQXEtoARypTKpkLD5C7oRLEVLBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "286"
+      "285"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:49 GMT"
+      "Fri, 28 Mar 2025 05:07:17 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "4742"
+      "1775"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_1.json b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_1.json
deleted file mode 100644
index 3b9bcdb57a..0000000000
--- a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW/iOBT9Kys/tySEgXR4S4HpsuKjwul0d1YrZOILeOvYke1kxFT8972OaacwqrQvMw9Iwffec4/vx/EzYbxhqgA+0mordrVhTmhFhs+kqK3T5bICZa0ciWoPJvjk0nYTMvz7nytSCiXKupwotpHA0XBvtNOFlmRI8hntrhNyRZy0b8PnmgOax5NP2cMsJ8crsmHFU12dQMhwy6QFPBXor6Bw2ng6cGE2wPi9gS0YQPoIaKHQijNz8JCFRPZg8kPlTfT3bDWejJFL0VKgYBowc6bYDkpQ7kQpy2cZXc+zRXb3g/MJaTK/nYxfoTw7rBZ1Rqid9SzZVyyBaJiDmVBP1DR4iHSqcDZRvNJCOV88TxLv4GCMP0RO4qR/Hfeuk0HeHQx76bDf/4JZuLBPVHyDu1sy7MWdOJw8MoOlfynlp4fZ7K/1Y7aat8SwHuZQeWKZW4F12JNGcMAqksVyMUGPndQbJkehRhTkNpSC0z0zHHFfi7wzuq6mWHQySOFDwvv8Y5pukjQdbFOWftj2NogmvtsHvbf2fpJwtEu2AWnDwEisiv98JnvsHcbtnavsMIoKqWt+zaHplFrtNN90Cl1GrBIRc5LZqEmiloyN3mMSnXpuXz6uP97cED8osp0OucXB+FV5ozDTkcH6awN/6I19pXKW+iztW+9fz9UqVtm9dv+H6Xffo5cBbxnfztm/2nxG9FZByE0nJq+2s+POAA2KlX54z5tVsdq+WfJKuEtZMFBJUbQqRSsowjC9P4JdvvW56rKdbfROPMQOo4MahXgcf3lworAnSERU1nld9LuH2PNufFrG6fKe+lWMcRVhYz9rWZfwojN5thij1PiMuJojXftdj3HVWe00LZhslwu1VZdV7df+R12rDHCBstLA5c0txsNYf1XnhmPg5QXiEu2INpAoUv7wZ1ytF7RNG+EOZJj6P0FrFqG52SMlQaqXSh5+VnFDP08pH+h6ktF83W0n85tWMH1fn2KvX97nFPwFP38LkUZrNwLjTtmndHW3Wi7zP7sYgezdS8hoNcny6eLOP3TgVbkdTf8OhsfhsotNWIQV9oVZoAcc/hJhZjklx/8AsxQIfY4HAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f3b/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "836"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "595"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_1.json b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_1.json
new file mode 100644
index 0000000000..808f0c9f68
--- /dev/null
+++ b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e62e857062fc48ea34cfeb_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bOBD9lQWfE0uW60v1pthq6oUvgaU0uy0WBiWNbTYUKZCUCjfwv3coKmnsosW+tA8GZA7nzNGZmaMnQouGihyKqRQ7tq8VNUwKEj6RvNZGlusKhNZ8yqoDKHcn5bofkPDTf1ekZIKVdRkLmnEoMHCnpJG55CQk6SLpbwNyRQzXr9OXsgAMz+J30f0iJacrktH8sa46EBLuKNeApwzvC8iNVJYOXIQV0OJOwQ4UIH0E1JBLUVB1tJA5R/ag0mNlQ8n7aDOLZ8glbykkoBpQSyroHkoQpqMUpYso2S6jVXT7w+UOKV7exLMXKMsO1UqMYmKvLUv6BSVgDTWwYOIxUQ0eIp3KncWiqCQTxopnSeI7GJjhD5EDPxhe+4PrYJL6w9Afh/23H7FKwfRjwr7C7Q0JB37PdycPVKH0z1K+u18s/t0+RJtlSwz1UMfKEovMBrTBnjSsAFSRrNarGG/sucwonzqNEuA7J0WRHKgqEPdF5L2SdTVH0cloDKMAJsOxPwp2+ZsJ0MGbfAcZorFX8fFwMuqP+sHQHw12PmQFxjnNgGs3MBxVsY9P5IC9w7yDMZUOPS/nsi6uC2h6pRR7WWS9XJYerZhHDafaawKvJaO9nzHxup7r54frt2Of2EHh7XTwHQ7Gn6rruZn2FOovFfwtM/1C5az0WdnXt/88Vy1opQ/S/B+m3++erA3YyOxmST9L9QHRWwchk56Vv4udHfdGGBC0tMN73qyK1vrVklfMXNqCgoqzvHWppILcDdMvRpCOba26bGcbbwcWYo/Zzo1cPo4/PxqW6w4SEYU21hft7iH2su93yzhf3yV2FX1cRcj0B8nrEp59Jo1WM7QaWxFXcypru+s+rjqtjUxyytvlQm+VZVXbtf/R1yoFBUNbaeDyzTXmw0x+EeeBk+NlDeIS7YQx4GhS9vB3vNrAeZtUzBxJOLZ/nNesXHOjh4Q4q14Lfvxd4rp+diXvk20cJem2307mVylg/gt/GhB3p0v+iI9/uUwlpZmCMl31ebK53azX6T99zED25jlluomjdL66tR86sK7cjqb9DrqPw2UXG7cIG+wL1ZAccfhLhFmkCTl9A7c1NxuOBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e857062fc48ea34cfeb/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "840"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "496"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/memory.json b/test/e2e/.snapshots/TestShardedCluster/memory.json
index 92e97dd84f..88bb661e99 100644
--- a/test/e2e/.snapshots/TestShardedCluster/memory.json
+++ b/test/e2e/.snapshots/TestShardedCluster/memory.json
@@ -1 +1 @@
-{"shardedClusterName":"cluster-988"}
\ No newline at end of file
+{"shardedClusterName":"cluster-970"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
deleted file mode 100644
index d3a65de65b..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAANVW227bOBD9lYIPfdnYkuzYcgQEhRO7gQtfAsvZ7KYoAkqkZNY0qZKUWyfwv+9Ql42dG4oW3UUBP8gznNuZ4RzeI5wbGcaYM5Gi4B7Fcp3lhtpPKnDEKUFBgrmmRyhTlLDYsA0dPtJosKcD+VUcKnZHiDC9ujh7Io5wvMqzx24idi6FoLGR6rn4imJyqWhCFRUxZIg0jaUgWG0RuIx5rg1Vi21mVfPh5Xh03g+HCwSq0iuTIjQK6tTWuzbY2oJ7tJYilSQKHAfHjbbhK7HyGnoJyobrwq+ZSJ7nS9asDjYI3TQFNUHLdz3/6Fkj70eMWq8bOe+05qdG5fQtdG0ZylzF9BSTNRNvFc04i3FIzSk2HOsG+yzvvrDaOaBQFxyqzUPNf2i1gbor8BrH7e5LKRQYQwsMHWA7H6jltjoNt91odRdeN2j7QfvkBpUdD9kdvThDgdvslIJrrCDJdCKJtXx/NR7/fXvdn0+GA7CAbqptZtvTN3OqzaWSG0YozACazqZDOJFyGWF+XiYZUp5MsMApJaEtrhjcakRSJfNsZHva9elxixwnXifp4Z4bn+Beq9fpRuCNPeg77RPfj1q+30187B/HMQE9xxHlMCMfP8E3Eyv7eY+WMHlgtzQm0wViMicFNhVOTbg5Ds6YU8DvbLym6xTpaOelXGrY9T7+yA46L6abJwD6fxfZKW+lo6AHUtEPMtL/JnMQ/CDw/un/I1stcKaX0nxPrg9nd9DbQjM4m+DPUv0J3mEAwbrXtJel0h2Im91acTUf/UZrYy/rq4zA5SXP3d5O52bv4DUzy1lxJ/VvVOnPLUiB13Y7Hd5Fka+LLQMweECBONf7jMjMYw7LquV19izD1VrIwtREVMumZfjFcNqfWtZ6mZjX+NtI2HUeU7tpUSByzqF3TDwV7yq2BS+Xh4H616FdvklCC07fN61OTCwq7AW5oilMRyW5Cm+H/XBx61mWqJC2w/Mel2TePpCGGY1tHQ9W8Ac2Ot8aFuspkAQA40JuHFKzAFaitgWQScXMFgV++SCYCb6tLXa7J2HK3f3axveeNLmsTMNbJGHpr8rzTooazhv4fOMVK0lJac6pMtUrZhTOL+az2eIvmyQwdZ8QWLf6h+i7eACYOuZoMLbEanBaER2Yw/wUuMGcmPK59Hh8N+U6nEPBWNNwC0HX4Gy8CNHuH+Wx5+VKCgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v1.0/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "909"
-    ],
-    "Content-Type": [
-      "application/json"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasLegacyClusterDescriptionResource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ],
-    "X-Xgen-Up-Proto": [
-      "HTTP/2"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e62e8358616125063f0cab_clusters_cluster-797_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e62e8358616125063f0cab_clusters_cluster-797_1.json
new file mode 100644
index 0000000000..b3687481f8
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e62e8358616125063f0cab_clusters_cluster-797_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAANVWbW8iNxD+K5U/3JcGdhcCyyFFFQlcRMVLxJKmTVVFZj27ODH2yvZyRyL+e8f70kBeTtVVbXUSH5YZz9sz43n8RGhuVRRTwWVK+k8kVpsst+A+QdKVAEb6CRUGTkimgfHY8i2MXmgM2sNQfZbHiv0JYdw8XJ6/Eq9o/JBnL92s+IWSEmKr9FvxNVB2pSEBDTLGDImBWElG9Y6gy1jkxoJe7jKnWoyuJuOLQTRaElSVXrmSkdVYp3HejaXOFt2TjZKpYqu+59G4YVrpw+P9umHWqGz4Pv6aq3vG0g1rVgcbDLZNCbbfCv0gPHnTKPgWo9bXjbyfjBFnVufwAbu2jlSuYzijbMPlBw2Z4DGNwJ5RK6hpBKf8C/Nr54hCXXCkt881/2j0FuuuwGuEH8P3UigwxhZYGFI3H6TltzoNv91o9ZZ+p++H/SC8JWXHI/4Il+ek7zc7peCGakwynSrmLD9dTya/3d0MFtPREC2wm3qXufYM7AKMvdJqyxngDJDZfDbCE6lQKyouyiQjEMmUSpoCi1xxxeBWI5JqlWdj19NuCN0W9NqdXjfoBq2O320nfkxX6I0f6Duh320l8WkPaPs0TsABJegKBM7I73/gN5cP7vOJrHHy0G5tbWYKxFTOCmwqnJp4czyaca+A39sGTd8r0jHee7nUsJtD/IkbdFFMt0gQ9P8uslfeSk9jD5SGn9XK/JXMUfCjwIen/49sjaSZWSv7d3J9PrvH3haa4fmU3iv9C3rHAUTrXtPNQKU7Eje7teJ6Mf6O1sZB1tcZw8vL3rq97fbtwcEbbtfz4k6a76jSf7YgJd247XR8F2W+KbYMwhAgBdLcHDIity85LKuW1/mbDFdrMQtbE1Etm5Xhl6PZYOZY631i3tAvY+nWeQxu05K+zIXA3nH5Wryv2Ba9XB0HGtxEbvkmCRScfmhanZg6VPg7cg0pTkcluY7uRoNoeRc4lqiQdsPziZZk3j6SRhnEro5nK/yDG13sLI/NDEkCgfExN4GpOQArUdsByJXmdkf6YfkgmEuxqy32+1dhyt39lY3/MXnV5LIyg2+RhKf/Vp6PStZw3uLnD0GxkrRS9gK0rV4x42hxuZjPl78Gjr/1dsAYrlvzTfRdPABsHXM8nDhitTStiA7NcX4K3HBObPlcejm+23IdLrBgaiDaYdANOpssI7L/E/8G+CJKCgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v1.0/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "909"
+    ],
+    "Content-Type": [
+      "application/json"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:34 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasLegacyClusterDescriptionResource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ],
+    "X-Xgen-Up-Proto": [
+      "HTTP/2"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
deleted file mode 100644
index 5303ee3f98..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UXU/bMBT9K5OfadOmHyl5CyVDndqCkjA2pgk58U3q4dqR7VYqiP/OddICZRraEw+V3HvvuV/nnjySnBb3mzqWNBfASFhSYeCE5HyqpITCKk3CRwLv3Boou9JQggZZAAmJgUJJRvWOPJ2QQmyMBZ3taudK4qv5bBqlcUbQ1WblSqZWc1kZzO4QmNDCOf4Q4Pf8Uac36PjjrD8OB0E4OL1FKOPmPuUPcHFGwl531BpuqF5jmoViDvn1ej7/eXcTJYv4HBHYm97VrlhkEzD2SqstZ4ATkeXlMsaISqicimnbbwqiXFBJK2DpimqGeV8GrrTa1DNcABkHMPTZsOyPygmd9IpTOvEno3GO2firfzQ4DYLcD4JxGdBgWBQM/YLmIHDiX7/xzeW9ez6SFe4RcStraxN6XiHUhnUYbLtrJSvF8m6h1h6tuUetoMbb+l7TjPH+1Ym33785PDrDwZg40kTDlCiRpM+q67X35Wncv9LwTeXmpZWj0kdl30Z/fq9G0tqslP2fTl9jn5DVxnN+tqB/lP6O2fH0ED3p9siL78jcdbxIunbHe0xWTTfmjeBqbt9LVEMteEEbLdVQtMf00Qn2Xa3NurltjO67FBWiUeklr1o8CFSnq7NPiZaydILdwkwaS1HtToNYZOFm4n/ZUMxui6idg9qW7XjRTerG0lxpbnckDNyfo4gsXkbLjBza2luv07s4SrO7frPgByVh9sGME9LG7MG3+PzSIrVSdgra7r9KszS5SC4vsx9uKziEPUCmSRxls+UFmi2t9mpFXvAz0+wax7LtF+w9IduW2QR3SA2kO2RzjQnnWUqengF60G8eaAUAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "640"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:39 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "77"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_2.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_2.json
deleted file mode 100644
index 2e20a1948d..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UbU/bMBD+K5M/8GWkaVLalEhoKm2HOrUFNWFsTBNykktqmtqZ7VQqiP++c5ICZQNN+4DUSs7dPffy3Ms9iWi8Kosxp1EOCfFTmis4JBEbCs4h1kIS/57AC7UEmlxISEECj4H4REEseELlljwckjgvlQYZbgujWowvppPhIBiHBFW1VyZ4oCXjmTLelaYGi+7JWvBMJJFv2zS2Ojpf8ZVjqSUqrXYbf61U5GW5ZK3G0Epg0+KgfddrO97hX0HO/4Dct0H2J6XyEy1LOKClXgailDGc0GTN+IGEImcxDUCfUJ1TZbFbcfeL7ZwjC7uCA7l5qvmjkhusuyHPOur0Xkuh4hhboGGEf/Tgtt2u1e5Ybi90en7H8zvH1xgmYWoVsDs4OyV+u9WtBVdUYpLZTCQG+flyOv1+czVYzMYjRGA35bYw7RnoBSh9IcWGJYAzQObn8zFaZLmIaD6skwwgT2eU0wySwBSHfh9HJJOiLCampz0PjtzkKHW6aZ/22/Ex7bv9bi9Cb+xJ3+0ce17kel4v9ah3FMcJ6nMaQY4z8uMnvhlfmec9WeLkIW6pdaEqxkSZVNw0PLVisbZpweyKfnvj2lUyyn4tkx3p6jn7xIx5Xs12niLl7xXXrjfSlsi/kPBFROoxlb3Qe2GfW79/rorTQi2F/pdMn2wfsKuVZnQ6o7dCfkXvOHqI7rfMmjS6PXHL9IXTtRne/WYVtFTPTlTB9Muj1ixmdX0KiOthemsEHROrXFezjdaOcZEhGm9jyrIaDzneMxOncYmSNDUnbgMTbhY9BrODGGRmamJ/yHCZDYu4O7ttm9flDa4CU5ZkQjK9Jb5nPvYswvF8MA/JLq1GehncjAdBeONUBN8JDpM3auyT2qYBX+PzQ42UQughSN3c8UmwOFucn4ffnPqC6R1kMpqay6Bp1mwq9gRPTMUzlqTre/+yGZu6qwvkjyoIttjJNTqbhgF5+A1NLdBilgYAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "748"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "95"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_3.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_3.json
deleted file mode 100644
index e5c0f155de..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbU/bMBD+K5M/8GW0aVLalEhoKtChTrRUTRgb04Sc5NKaunZmO5EK4r/vnKRA2UDTPiC1knt3z70899J7EtNkVeQjQWMOKQkyyjXsk5idSCEgMVKR4J7AC7UCms4UZKBAJEACoiGRIqVqQx72ScILbUBFm9yq5qPZ+fhkGI4igqraK5MiNIqJhbbetaEWi+7JWoqFTOPAcWjS6hq+Eiu3pZeobHU6+GlnkhfFkrUbw1YKZVuACTy/4/r7fwW5/wPy3gY5n7TmR0YVsEcLswxloRI4oumaiT0FOWcJDcEcUcOpbrFbefeLbZ0jC9uCQ1U+1fxRqxLrbshrHXT7r6VQcYwtMHCKX/Tgdbxeq9Ntef3I7QddP+geXmOYlOlVyO7g7JgEnXavFlxRhUkuJjK1yM+X5+ffb66G88noFBHYTbXJbXuGZg7azJQsWQo4A2R6MR2hxYLLmPKTOskQeDahgi4gDW1x6PdxRBZKFvnY9rTvw4GXHmRuLxvQQSc5pANv0OvH6I096XvdQ9+PPd/vZz71D5IkRT2nMXCckR8/8c3Eyj7vyRInD3FLY3JdMSaLtOKm4amdyLVDc+ZU9Dul51TJaOe1TLak6+fsEzvmvJptniHl7xXXqTfSUci/VPBFxvoxlZ3QO2GfW79/rlrQXC+l+ZdMn2wfsKuV5vR4Qm+l+orecfQQPWjbNWl0O+K27Yugazu8u83KaaGfnaicmZdHrVnM6vrkkNTD9NYIujZWsa5mG61d62KBaLyNGVvUeOB4z2ycxiVKssyeuBLGwi56AnYHMcjE1sT+kOEyWxZxd7bbNq3LG16FtizFpGJmQwLf/tixiEbT4TQi27Qa6WV4MxqG0Y1bEXwnBYzfqHFAapsGfI3PDzVSSWlOQJnmjo/D+dn84iL65tYXzGwhl7PTYTSenqHY0IaVFWDCeE5KFJaUF9YOPKj8YsvwAlVtwIpN/Xfwsldl3fQ50ks1hBts9Bp9nEchefgNVj0BB7UGAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "767"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:57 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "74"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_4.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_4.json
deleted file mode 100644
index 739259bf46..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_4.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1U227aQBD9lWof8tKAsbmYWIoqAjSiAoKw07Spqmhtj80Gs+vurpFIlH/vrG2SkDZR1YdIIK1n5szlzOWehDRaF/mY0zCDmHgJzRQck5ANBecQaSGJd0/ghVoCjRcSEpDAIyAeURAJHlO5Iw/HJMoKpUEGu9yoluPFdDIc+OOAoKryygT3tWQ8Vca70tRg0T3ZCJ6KOPQsi0aNts7WfG031AqVjVYLf81EZEWxYs3asBHDtslBe47bst3jv4Ls/wE5b4OsT0plp1oWcEQLvfJFISM4pfGG8SMJecYi6oM+pTqjqsFuxd0vtneOLOwL9uX2qeaPSm6x7pq8Rqfdey2FkmNsgYYR/tGD03K6jVa74fQCu+e1Xa99co1hYqbWPruD8zPitZrdSnBFJSaZzkRskJ8vp9PvN1eD5Ww8QgR2U+5y056BXoLSCym2LAacATK/mI/RIs1ESLNhlaQPWTKjnKYQ+6Y49Ps4IqkURT4xPe250HHiTmJ3kz7tt6IT2nf63V6I3tiTvts+cd3Qcd1e4lK3E0Ux6jMaQoYz8uMnvhlfm+c9WeHkIW6lda5KxkQRl9zUPDUjsbFozqySfmvrWGUyynotkz3p6jn7xIx5Vs52liDl7xXXqjbSksi/kPBFhOoxlYPQB2GfW79/rorTXK2E/pdMn2wfsKulZnQ2o7dCfkXvOHqI7jfNmtS6A3HT9IXTjRnew2bltFDPTlTO9MujVi9meX1yiKphemsEbROr2JSzjda2cZEiGm9jwtIKDxneMxOndomSJDEnbgsTbhY9ArODGGRmamJ/yHCZDYu4O/ttm1flDa58U5ZkQjK9I55rPg4sgvF8MA/IPq1aeunfjAd+cGOXBN8JDpM3auyTyqYGX+PzQ4WUQughSF3f8Ym/PF9eXATf7OqC6T3kcjEaBJP5OYo1Tettxb7gmSm5xrJ0dfNfNmRbdXaJHFIF/g67uUGH08AnD78BheUtJpoGAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "752"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:38:51 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "93"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_5.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_5.json
deleted file mode 100644
index dccac6ea69..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_5.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1U226bQBD9lWpfG4ONLzi8EZtGrmzHMqRpU1XRAgPeBu+i3QXJifLvnQWcxKka9SkPlvDMnLmcmbOPJKbJfVUGnMYFpMTLaKHgjMRsJjiHRAtJvEcCb9wSaLqRkIEEngDxiIJE8JTKA3k6I0lRKQ0yOpTGtQ02y8XMD4OIoKvNygQPtWQ8Vya70tRg01DWGL8XPBdp/FnJ2rPtLldvNJxYmSiqasesLqKXQm1x0E1J7EjDHH+Ywek7415/2HMm0WDiDV1veH6LtVOm7kP2AJcXxOtb49ZwQ+Ue+1iJ1CC/XC+XP+5u/O0qmCMCh5OH0nTr6y0ovZGiZikgJWR9tQ4wIi9ETItZ22QIRbainOaQhjucB/M+M5ZLUZULZJBMXBg56SgbjLMpnfaTczp1puNJjNnYi388PHfd2HHdSeZSd5QkKfoLGkOBlP38hd+M35vPR7LDRSBup3WpGsZElTbcdDxZidjbtGQ21QVVdu3YTTPK/lcnR9LVa/aJ2XrRrLrIkPKPqmu3B2pL5F9I+Cpi9dzKSemTsq+jP75XxWmpdkL/T6cvsU+41cYzv1jR30J+w+x4eoieWn3y7DsxW2YvnO7N8Z4uq6SVeqXYkum3GpdQFiyhjRhLSNpjeu8EB6ZWtW9uG6MHJkWOaHwqMpa3eChQ3qZOlxItWWYUX8OCG6EnYDSIRVZmJvaXDcVsWETtHNW2bsfzb0IzlmRCMn0gnmv+nEREwdpfR+TYVme9Du8CP4zuBg3BD4LD4p0Zp6SN6cC3+PmpRUoh9Ayk7p61Rbi93F5dRd8NKziEPkKuN3M/Wqwv0axp3qkV94LPTMM1jqXbJ/DtQup2s1vkkCoID7jNPSZcRiF5+gMrJmOCqQUAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "670"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:39:20 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "68"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_6.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_6.json
deleted file mode 100644
index 0164e74f46..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_6.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXY/aOhD9K5Wfd8kHkLB5o0BXVLuASLb3qlfVynEm4K5jR7ZDRVf8946TdLtw1aov7QNS8MycOeOZM34mtDhQyaCYKVnyXaOp5UqS5JmwxlhVrWuQxogZr/egO59MmCAkyX+frkjFJa+aaiFpLqBAw0Yrq5gSJCHZXRo8huSKWGFeh9+rAtA8X7ybPtxl5HRFcsqemroHIUlJhQE85egvgVmlHR24MGugxUZDCRqQPgIaYEoWVB8dJBPIHnR2rJ1pu9jcLWfTdJEhHdahYpWp1VzuDKK7CAS0MMcfBoR+OL72h9dhlAVRMoyTcfQRQwtunlL+FW7fkmTkD/wrZMX0sXZgU7sFY7H+Ay8AGZPVerXAmJ1QORWzjk8Korynku6gSPdUF5j+paCdVk29xAJJFMMoLEZlMC4ndOKzGzoJJ+MoRzT+wx6NaJHTaBwM6YSNS1a6uxY0B2G65ggun9znM9njPWHc3traJJ7HhGqK6wIOg0rJnSryAVOVR2vuUSuo8Q6h15Ix3s+YeP39mu8f16NhRFxTRNsJUWIT/lZer5sfT+P9Kw3vVW5eqJylPkv72vvvczWS1mav7O8w/eF7cpJzlvnbe/pZ6Q+I3qqVTAY+ebGdHQ9cXySt3FifN6umjXklqJrbSwlqqAVn7UZIa2DdML0awfHwJo7zMI6jMqbxiLHA5WqqdrbRO3AQO4zulN/F4/iLo+XM9JCIKI11O8hJC7HvA7/X2nK9SUky9H2ntNx8UKKpoNd0mk1X8+l27jLiRpmpRlqS+Khk2liVMipaceEeU1XdOFX/f4fUGgqOq+AAl5UbjIe5+iLPDaeOl9P/JdoJbSBwsbjDP1Ha8OQIc6W5PZIkdn+6XbPqmjv9JyXdWlxLcfxTl9v1s0/5kD4upmn2GLST+VVJWP5iP7nEzqcP/oifb7pIrZSdgbZ99mW6vd2u19m/bpyQvf0e8rCZT7Pl6tY9KrQfpyfA28BeHPDwQEXj/CCEFhdnHV+odn7dw9Rt/ctWHzq1bLF51EB6RIVUiHGXpeT0DU8Aul4fBwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "801"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:39:24 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "65"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_7.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_7.json
deleted file mode 100644
index 57f6726485..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_7.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbY/iNhD+K5U/3JfykoSXcJFWFQd0RbULiGSv1VWnlXEm4MOxU9uhYlf8946T7C3Q3qk66U4CCTwzz4xnnnn8TGh6oJJBOlEy49tSU8uVJNEzYaWxKl8WII0RE17sQNc+iTB+QKI/P7ZIziXPy3wm6UZAioaVVlYxJUhEkrvYfwxIi1hhzsPvVQpons5+HT/cJeTUIhvK9mXRgJAoo8IAnnL0l8Cs0q4cuDJroOlKQwYasHwENMCUTKk+OkgmsHrQybFwpvVsdTefjONZguWwGhVvGVvN5dY4dGOpi0V4kiu5Vekm6nYpa/es2Mu93zY7NLY9Dz+dTImy3PFO49hO4dCRYKMg9Pyw9Z9B/rcEBV8P6v6Cc7mxuoQ3tLS7WJWawQ1NcSZvNBSCMxqDvaFWUNPmn9TTX/wFHLvwcuFYH17v/LPRB7x307x2vzf8UglVj3EEFqb4RYTACwZtr9cOhok/jHphNBh+wDQpN/uYP8HtOxL1vY7XwjkyfSxc+8d2DcYiYw48BZwxWSwXM4zZCrWhYlIXEYPI7qmkW0hjVzwO7DMFtlqVxdzNbBhCP0j7mT/IRnTksbd0FIwGww2i8Vf7sE/TDR0O/B4dsUHGMsdOQTcgTE1nweXe/XwmO2QWxu2sLUzVEVWm1d2bPnSYyru04N2qvd1D0K2KMd0vVfLSVHPeXeJoLCruigxb+qPyduuN62rsv9Lwm9qYz6VcpL5Ie+7942s1khZmp+z/qfTV9+REylmm7+7pJ6XfI3qlb2TUcWvQ2C6OO24ukuaO1pfDKmhpziSo4PZatJrFq9SlAFaT6YyCg97bMNwEYTjMQhr2GfNdrjKvuI3evoPYYnStlXU80l8cLWemgURE6faXgVstxL73vWbX5stVTKKe57lN25j3uL05NCoYJ+PFdLyeuoyowRNVSksiDzcZ9UPFjIpquVD5VV6Ubqv/rbqFhpSjeB7g+uYG42Gq/paXhlNdl9v/a7QT2kCgFLvD73G13skVzJXm9kii0P2ptWZRD3f8e0zqh2QpxfF7NbeeZ5PyIX6cjePk0a+Y+aQkzL+iTy6x82mCP+DPn+pIrZSdgLZN9nm8vl0vl8kffi3t9iXkYTUdJ/PFrXuGaUOnPWA3cBYHPDxQUTo/CKDCRa7j+1Hx1z3l9Tt5PepDvS1rHB41EB9xQ3LEuEticvoHmmNmu1EIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "914"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:13 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "82"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_8.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_8.json
deleted file mode 100644
index 24c1356dc5..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_8.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbY/bNgz+K4M+9MvyYjsvTg0chjTJigy5yyFOu6FDcZBlOlEjS54ke8gd8t9H2b5ekq3FUKAFEiARyYcU+fDRE6FpRSWDdKZkxnelppYrSaInwkpjVb4uQBojZrzYg258tsL4AYn+/NghOZc8L/OFpImAFA33WlnFlCAR2a5i/yEgHWKFOQ+/VSmgeb74dfputSWnDkkoO5RFC0KijAoDeMrRXwKzSrty4Mqsgab3GjLQgOUjoAGmZEr10UEygdWD3h4LZ9os7lfL2TRebLEc1qDiLWOrudwZh24sdbEIT3IldypNon6fsu7AioM8+F2zR2PX8/DTy5Qoyz3vtY7dFKqeBBsFoeeHnf8M8r8lKPh6UP8XnMuN1SW8oqXdx6rUDG5oijN5paEQnNEY7A21gpou/6Qe/+LP4NiF5wvHunq5889GV3jvtnnd4WD8pRLqHuMILMzxiwiBF4y63qAbjLf+OBqE0Wj8AdOk3Bxi/ghv35Bo6PW8Ds6R6WPh2j+1GzAWGVPxFHDG5G59t8CYnVAJFbOmiBhEdksl3UEau+JxYJ8psNOqLJZuZuMQhkE6zPxRNqETj72mk2AyGieIxl/s4yFNEzoe+QM6YaOMZY6dgiYgTENnweXB/Xwie2QWxu2tLUzdEVWm9d3bPvSYyvu04P26vf0q6NfFmP6XKnluqjnvLnE0FjV3RYYt/VF5+83G9TX2X2n4TSXmcykXqS/Snnv/+FqNpIXZK/t/Kn3xPTmRcpb5m1v6Sen3iF7rG5n03Bq0tovjnpuLpLmj9eWwClqaMwkquL0WrXbxanUpgDVkOqPgaPA6DJMgDMdZSMMhY77LVeY1t9HbdxA7jG60solH+ouj5cy0kIgo3f4ycKuF2Le+1+7acn0fk2jgeW7TEvMetzeHVgXj7fRuPt3MXUbU4JkqpSWRh5uM+qFiRkW9XKj8Ki9Kt9X/Vt1CQ8pRPCu4vrnBeJirv+Wl4dTU5fb/Gu2ENhAoxe7we1xtcHIFc6W5PZIodH8arblrhjv9PSbNQ7KW4vi9mtvMs035Ln5YTOPtg18z81FJWH5Fn1xi59MGf8CfPzWRWik7A23b7Mt483azXm//8Btpt88hy/nKSaqlLZUOgJ3AOVR4WFFROh8IoMZEnuPbUXPXPePNG3k95qrZlA0OjhqIj7gdOWKstjE5/QOxZaz6TQgAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "910"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:47:29 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "111"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_1.json
new file mode 100644
index 0000000000..dd56aacec1
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U32+bMBD+VyY/N4GQBlLeaMqqTElaAV23TlNl4CBeHRvZTqS06v++M5Cu6dRpT32I5Nzdd7+++3giOS0etk0saM6hJGFFuYYTkrOZFAIKIxUJnwi8cSug5bWCChSIAkhINBRSlFTtyfMJKfhWG1DZvrGuJL5ezGdRGmcEXV1WJkVqFBO1xuwWgQkNXOAPAZ7rTQbueOBNM3cSukE4Cu4QWjL9kLJHuDwnoTucdIZbqjaYZilLi/x8s1h8v7+NkmV8gQjsTe0bWywyCWhzreSOlYATkdXVKsaImsuc8lnXbwq8WlJBayjTNVUl5n0ZuFZy28xxAcQPwPdgOp5M/ZE/8iauP67cguaYjb3yTwLX96ridAp0fFpU4KKf0xw4TvzjJ76ZeLDPJ7LGPSJubUyjQ8cpuNyWgxJ2w40UtSzzYSE3Dm2YQw2n2tl5TtuMdt7rxOn3rw+PQXAWEEsab5niFZL0UXWd7r4chfuXCr7IXL+0clT6qOzr6I/vVQva6LU0/9Ppn9hnZLX1XJwv6S+pvmJ2PD1ET4eW/d53ZB766BB0Y4/3mKyGbvUrwTXMvJWogoazgrZaaqDojukfJ3hW2VrbTXvbGD2yKWpEo9IrVnd44KhOW6dPiZaqsoLdwVxoQ1HtVoNYZGlnYn/ZUMx2i6idg9pW3XjRbWrHUkwqZvYkDOyfo4gsXkWrjBza6q036X0cpdn9qF3woxQwf3/G/JR0MT34Dp+fOqSS0sxAmf6rNE+Ty+TqKvs2QgQOYQ6QWRJH2Xx1iWZD616tyAt+Ztpd41im+4K9JWTXMZvgDqmGdI9sbjDhIkvJ829uzc9laAUAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "640"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:17 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "65"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_2.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_2.json
new file mode 100644
index 0000000000..63052e4e20
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U207bQBD9lWofeCmOL7k4WEJVSFKUKgkoNqWlqtDaHjtLHK+1u44aEP/eWduBhBZU9QEpkdYzc+Zy5vJAQhqtymKc0zCDmHgJzSQck5ANeZ5DpLgg3gOBF2oBNL4UkICAPALiEQkRz2MqtuTxmERZKRWIYFto1WJ8OZ0MB/44IKiqvTKe+0qwPJXau1RUY9E9WfM85XHomSaNDOmkq/u7pSGXqDQsC3+t8C6O03XcagyNGDatHJTnuJbtHv8VZP8PyHkbZH6SMjtVooQjWqqlz0sRwSmN1yw/ElBkLKI+qFOqMioNu8N+xdbOObKwK9gXm+eaP0qxwbob8gz3xH0thYpjbIGCEf7Rg2M5XcNqG04/sLqe5Xq2e4NhYiZXPruH8zPiWa1uLbimApNMZzzWyM9X0+n32+vBYjYeIQK7KbaFbs9ALUCqS8E3LAacATK/mI/RIs14SLNhnaQPWTKjOU0h9nVx6PdpRFLBy2Kie9pzoedAv93t9+ye7XStXjuxIhqiN7an77pWz0miTh9ouxMloInKaAgZzsiPn/hm+Uo/H8gSJw9xS6UKWTHGy7jipuGpFfG1SQtmVvSbG8eskpHma5nsSJf77BM95lk121mClL9XXLPeSFMg/1zAFx7Kp1QOQh+E3bd+/1xlTgu55OpfMn22fcSuVprR2YzecfEVvePoIbrf0t1vdAfiVg8VOV3r4T1sVkFLuXeiCqZeHrVmMavrU0BUD9MbI3iS6FjluppttLa1ixTReBsTltZ4yPCe6TiNS5QkiT5xG5jketEj0DuIQWa6JvaHDJdZs4i7s9u2eV3e4NrXZQnGBVNb4rn648AiGM8H84Ds0mqkV/7teOAHt3ZF8D3PYfJ6jWGH1DYN+AafH2qk4FwNQajmjk/8xfni4iL4ZtcXTO0gk9FUXwZF02ZTsSd4YiqesSRV3/uXzdjUXV0gf1SCv8VOrtHZNPDJ4299+yRYlgYAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "748"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:34 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "52"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_3.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_3.json
new file mode 100644
index 0000000000..edfa6a1813
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227aQBD9lWof8tKAL1xMLEUVARpRBYKw07Spqmhtj80G47V211ZJlH/vrG0SSJuo6kMkkJaZOXM5c+GBBDRcF/kko0EKEXFjmko4JgEb8SyDUHFB3AcCL9QCaLQQEIOALATiEgkhzyIqtuTxmIRpIRUIf5tr1XKyuJiOht7EJ6iqvTKeeUqwLJHau1RUY9E92fAs4VHgGgYNW9JO1vd3q5ZcobJlmvhpB3dRlGyidmPYiqBsZ6Bc2zEt5/ivIOt/QPbbIOOTlOmpEgUc0UKtPF6IEE5ptGHZkYA8ZSH1QJ1SlVLZsrrsV2TunCMLu4I9UT7X/FGKEutuyGs5J85rKVQcYwsUjPGLHmzT7rXMTsse+GbPNR3Xcm4wTMTk2mP3cH5GXLPdqwXXVGCSyYxHGvn56uLi++31cDmbjBGB3RTbXLdnqJYg1ULwkkWAM0Dml/MJWiQpD2g6qpP0II1nNKMJRJ4uDv0+jUgieJFPdU/7DvRtGHR6g77Vt+ye2e/EZkgD9Mb29D3H7Ntx2B0A7XTDGDRRKQ0gxRn58RPfLFvr5wNZ4eQhbqVULivGeBFV3DQ8tUO+MWjOjIp+o7SNKhlpvJbJjnS5zz7RY55Ws53GSPl7xTXqjTQE8s8FfOGBfErlIPRB2H3r989VZjSXK67+JdNn20fsaqUZn83oHRdf0TuOHqIHbd39RncgbvdRkdGNHt7DZuW0kHsnKmfq5VFrFrO6PjmE9TC9MYInsY5VbKrZRmtLu0gQjbcxZkmNhxTvmY7TuERJHOsTV8I004segt5BDDLTNbE/ZLjMmkXcnd22zevyhteeLkswLpjaEtfRPw4s/Ml8OPfJLq1GeuXdToaef2tVBN/zDKav1xh0SW3TgG/w+aFGCs7VCIRq7vjUW54vLy/9b1Z9wdQOcrUYD/3p/BzFijasrAETxnNSorCkaaHtwIbKL7YML1DVBqxY1X8HL3tV1k1fIr1UgrfFRm/Qx4XvkcffihCugbUGAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "767"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:35 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "53"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_4.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_4.json
new file mode 100644
index 0000000000..dd749c1ad9
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_4.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U207bQBD9lWofeCmOL7k4WEJVSFKUioQoNqWlqtDaHjtLHK+1u44aEP/eWduBhBZU9QEpkdYzc+Zy5vJAQhqtymKc0zCDmHgJzSQck5ANeZ5DpLgg3gOBF2oBNJ4LSEBAHgHxiISI5zEVW/J4TKKslApEsC20ajGeX0yGA38cEFTVXhnPfSVYnkrtXSqqseierHme8jj0TJNGhnTS1f3d0pBLVBqWhb9WeBfH6TpuNYZGDJtWDspzXMt2j/8Ksv8H5LwNMj9JmZ0qUcIRLdXS56WI4JTGa5YfCSgyFlEf1ClVGZWG3WG/YmvnHFnYFeyLzXPNH6XYYN0NeYZ74r6WQsUxtkDBCP/owbGcrmG1DacfWF3Pcj3bvcEwMZMrn93D+RnxrFa3FlxTgUmmUx5r5Oeri4vvt9eDxXQ8QgR2U2wL3Z6BWoBUc8E3LAacATK7nI3RIs14SLNhnaQPWTKlOU0h9nVx6PdpRFLBy2Kie9pzoedAv93t9+ye7XStXjuxIhqiN7an77pWz0miTh9ouxMloInKaAgZzsiPn/hm+Uo/H8gSJw9xS6UKWTHGy7jipuGpFfG1SQtmVvSbG8eskpHma5nsSJf77BM95lk121mClL9XXLPeSFMg/1zAFx7Kp1QOQh+E3bd+/1xlTgu55OpfMn22fcSuVprR2ZTecfEVvePoIbrf0t1vdAfiVg8VOV3r4T1sVkFLuXeiCqZeHrVmMavrU0BUD9MbI3iS6FjluppttLa1ixTReBsTltZ4yPCe6TiNS5QkiT5xG5jketEj0DuIQaa6JvaHDJdZs4i7s9u2WV3e4NrXZQnGBVNb4rn648AiGM8Gs4Ds0mqkV/7teOAHt3ZF8D3PYfJ6jWGH1DYN+AafH2qk4FwNQajmjk/8xfni8jL4ZtcXTO0gV/PRIJjMzlGsaNpsK/YFz0zFNZal6pv/siGburML5JBK8LfYzTU6vAh88vgbrane6ZoGAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "752"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:00 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "52"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_5.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_5.json
new file mode 100644
index 0000000000..bce3e8c5e6
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_5.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1UTW/aQBD9K9VeG7AxwSa+OeBGVEAQdpo2VRWt7bHZxOxau4slEuW/d9Y2KaRK1VMOSGZm3ny8mbfPJKHp464KOU1KyIif01LBGUnYRHAOqRaS+M8E3rgl0GwlIQcJPAXiEwWp4BmVe/JyRtJypzTIeF8Z1zpczWeTIApjgq42KxM80pLxQpnsSlODzSJZY/xW8EJkyWcla9+yulw978LrJw9ZVmyzfhfRy6Duc9BNSexIwxR/mMGxnVHPHvaccWyPfNvzB94d1s6YeozYE1xdEt/uj1rDLZVb7GMhMoP8cjOf/7i/DdaLcIoIHE7uK9NtoNeg9EqKmmWAlJDl9TLEiKIUCS0nbZMRlPmCclpAFm1wHsz7ylghxa6aIYPE9cB1YDwcjd2BO3BGtjvM7ZQmmI0d+Uee7Tp5ej4GOjxPc7DRX9IESqTs5y/8ZvzRfD6TDS4CcRutK9UwJnZZw03HUz8VW4tWzKK6pMqqHatpRlnvdXIgXR2zT8zWy2bVZY6Uf1Rdqz1QSyL/QsJXkajXVk5Kn5Q9jv74XhWnldoI/T+d/ol9wa02nunlgj4I+Q2z4+khetw32+98J+a+iw5Ot+Z4T5dV0Z06UmzF9FuNS6hKltJGjBWk7TH94wQvclNrt21uG6MHJkWBaHwqcla0eChR3qZOlxIteW4UX8OMG6GnYDSIRRZmJvaXDcVsWETtHNS2bMcLbiMzlmRCMr0nvmf+nETE4TJYxuTQVme9ie7DIIrvBw3BT4LD7P0Zk3PSxnTgO/z81CKlEHoCUnfP2ixaX62vr+PvA0TgEPoAuVlNg3i2vEKzpkWnVtwLPjMN1ziWbp/Atwup282ukUOqINrjNreYcB5H5OU33tC2KKkFAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "671"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:25 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "64"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_6.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_6.json
new file mode 100644
index 0000000000..e07d447ae3
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_6.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW/aMBD+K5M/t+SF8tJ8Y8AqphYQSbdp01QZ5wJeHTuyHSZW8d93jrMOmDbtS/sBKfjunnvOd8/5idB8RyWDfKxkwTe1ppYrSZInwmpjVbmoQBojxrzagvY+mTBRTJIvXy9IySUv63Iq6VpAjoalVlYxJUhCsts0eojJBbHCHIffqRzQPJm+G93fZuRwQdaUPdZVC0KSggoDeMrRXwKzSjs6cGbWQPOlhgI0IH0ENMCUzKneO0gmkD3obF8502q6vJ2NR+k0QzrMo2KVqdVcbgyiuwgEtDDBHwbEYdy7DLuX8TALe0k4SLq9zxiac/OY8h9w85YkV2EnvEBWTO8rBzayKzAW69/xHJAxmS/mU4zZCLWmYuz5pCCKOyrpBvJ0S3WO6Z8L2mhVVzMskPQH0I9h2O0N+1E/inthv1uEjK4Rjf+2Xw+O7VGUM7QLugZhfHMEl4/u84ls8Z4wbmttZZIgYELV+WUOu06p5Ebl6w5TZUArHlArqAl2cdCQMcHfmATt/ZpfH5eD6wFxTRFNJ0SBTXitvIGfn0Dj/SsN79XaPFM5SX2S9tj79bkaSSuzVfZ/mP72PTjJOcvk7R39pvQHRG/USoadkDzbTo47fTRIWrqxPm1WRWtzJKiK23MJaqgEZ81GSCtgfpiORnDYG4T9uGBXQ6DdK1ZcFy5XXTazjd6Rg9hgtFe+j8fxF3vLmWkhEVEa63aQkxZi30Vhq7XZYpmSpBuGTmlr80GJuoRW02k2mk9Gq4nLiBtlrGppSRKikmltVcqoaMSFe0yVVe1U/ecOqTTkHFfBDs4rNxgPE/VdnhoOnpfT/znaAW0gcLG4w5corXtwhLnS3O5JMnB//K6Z++aOPqbEr8WFFPuXulzfzzblffowHaXZQ9RM5g8lYfaP/USJ92mDP+PnGx+plbJj0LbNPktXN6vFIvsUYQSyt79C7peTUTab37hHhbbj9Ah4G9iLHR7uqKidH8TQ4OKs4wvVzK97mPzWP2/1zqtlhc2jBtI9KqREjNssJYef0Nqz7h8HAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "791"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:33 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "48"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_7.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_7.json
new file mode 100644
index 0000000000..e835911f9e
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_7.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW8iNxD+K5U/3JcC+0J4yUpRxQGNqBJA7ObudFUVGe8ADl57ZXu3JRH/vePdzQVo71RVupNAAs/MM+OZZx6/EJqWVDJIx0pu+LbQ1HIlSfRCWGGsyhY5SGPEmOc70LVPIkwQkuj3P1ok45JnRTaVdC0gRcNSK6uYEiQiyV0cPIakRawwp+H3KgU0T6a/jh7uEnJskTVl+yJvQEi0ocIAnnL0l8Cs0q4cuDBroOlSwwY0YPkIaIApmVJ9cJBMYPWgk0PuTKvp8m42HsXTBMthNSreMraay61x6MZSF4vwJFNyq9J15HmUtU243T8/7dpmh8a27+Ons35K022WdhrHdgplR4KNwoEfDFr/GhT8n6Dw20HeLziXG6sLeEcLu4tVoRnc0BRn8k5DLjijMdgbagU17eCK/5X6r+DYhdcLx7p8u/PPRpd476Z57cH14GslVD3GEViY4BcRQj/stf1uOxwmfi/yB1G39xnTpNzsY/4Mt+9JdOV3/BbOkelD7to/siswFhlT8hRwxmS+mE8xZivUmopxXUQMYnNPJd1CGrvicWBfKLDVqshnbmb9AfRDGHZ7w37QD8Ke3+9ufEbXiMbf7NeDU3sQpAztgq5BmJrOgsu9+/lCdsgsjNtZm5uqI6pIq7s3fegwlXk0517VXq8MvaoY432tktemmtPuEkdjUXFXbLClPyqvV2+cp7H/SsNvam2+lHKW+iztqfePr9VImpudsv+l0jffoxMpZ5m8v6dPSn9A9ErfyLDj1qCxnR13+miQNHO0Ph9WTgtzIkE5t5ei1SxepS45sJpMJxQc9gZ+P9ywqyHQ7hXbXG9criKruI3egYPYYnStlXU80l8cLGemgURE6faXgVstxL4P/GbXZotlTKKu77tNW5sPShQZNCoYJ6P5ZLSauIyowWNVSEsiHzcZ9UPFjIpquVD5VZYXbqv/qbq5hpSjeJZweXOD8TBRf8pzw7Guy+3/JdoRbSBQit3h97ha9+gK5kpzeyDRwP2ptWZeD3f0MSb1Q7KQ4vC9mlvPs0n5ED9OR3HyGFTMfFYSZt/QJ0pqnyb4M/78qY7UStkxaNtkn8Wr29VikXwKamm3ryEPy8komc1v3TNMGzrtAbuBsyjxsKSicH4QQoWLXMf3o+Kve8rrd/Jy1GW9LSscHjUQH3BDMsS4S2Jy/BupZoz6UQgAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "907"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:17:36 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "59"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_8.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_8.json
new file mode 100644
index 0000000000..fc40c558d5
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_8.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY/iNhD+K5U/3JcCeWEhbKRVxQE9UbHLiuRedFW1Ms4AXhw7sp207Ir/3nGSvQXaO1WV7iSQwDPzzHjmmcfPhGYVlQyyiZIbvi01tVxJEj8TVhqr8mUB0hgx4cUOdOOTChOEJP79jw7JueR5mc8kXQvI0HCvlVVMCRKTdJEEDyHpECvMafitygDN09mv4/eLlBw7ZE3ZvixaEBJvqDCApxz9JTCrtCsHLswaaHavYQMasHwENMCUzKg+OEgmsHrQ6aFwptXsfjGfjJNZiuWwBhVvmVjN5dY4dGOpi0V4kiu5Vdk69jzKuibc7p8ed12zQ2PX9/HTWz9m2TbPeq1jN4OqJ8HGYeQHUedfg4L/ExR+O8j7BedyY3UJb2hpd4kqNYMbmuFM3mgoBGc0AXtDraCmG1zxvzL/BRy78HLhRFevd/7Z6Arv3TavG11HXyuh7jGOwMIUv4gQ+uGg6/e74Sj1B7Efxf3BZ0yTcbNP+BO8e0viK7/nd3COTB8K1/6xXYGxyJiKZ4AzJnfLuxnGbIVaUzFpikhAbG6ppFvIElc8DuwLBbZalcXczWwYwTCEUX8wGgbDIBz4w/7GZ3SNaPzVfh2d2oMgY2gXdA3CNHQWXO7dz2eyQ2Zh3M7awtQdUWVW373tQ4+p3KMF9+r2elXo1cUY72uVvDTVnHaXOBqLmrtigy39UXm9ZuM8jf1XGn5Ta/OllLPUZ2lPvX98rUbSwuyU/S+VvvoenUg5y/TtLX1U+gOi1/pGRj23Bq3t7Lg3RIOkuaP1+bAKWpoTCSq4vRStdvFqdSmANWQ6oeBoEPnDcMOuRkD7V2xzvXG5yrzmNnoHDmKL0Y1WNvFIf3GwnJkWEhGl218GbrUQ+zbw212bL+8TEvd9323a2nxQosyhVcEkHd9Nx6upy4gaPFGltCT2cZNRP1TCqKiXC5Vf5UXptvqfqltoyDiKZwWXNzcYD1P1pzw3HJu63P5foh3RBgKl2B1+j6v1j65grjS3BxJH7k+jNXfNcMcfE9I8JEspDt+ruc0825Tvk4fZOEkfgpqZT0rC/Bv6REnj0wZ/xp8/NZFaKTsBbdvs82T1brVcpp+CRtrtS8h8unCSamlLpT1gJ3AOFR5WVJTOB0KoMZHn+HbU3HXPePNGXo65ajZlhYOjBpIDbkeOGIs0Ice/AabmoitNCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "903"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:17:53 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "60"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_9.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_9.json
new file mode 100644
index 0000000000..518bfc1056
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_cluster-797_9.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW8iNxD+K5U/3JcC+0J4yUpRxQGNqBJA7ObudFUVGe8ADl57ZXu3JRH/vePdzQVo71RVupNAAs/MM+OZZx6/EJqWVDJIx0pu+LbQ1HIlSfRCWGGsyhY5SGPEmOc70LVPIkwQkuj3P1ok45JnRTaVdC0gRcNSK6uYEiQiyV0cPIakRawwp+H3KgU0T6a/jh7uEnJskTVl+yJvQEi0ocIAnnL0l8Cs0q4cuDBroOlSwwY0YPkIaIApmVJ9cJBMYPWgk0PuTKvp8m42HsXTBMthNSreMraay61x6MZSF4vwJFNyq9J15HmUtU243T8/7dpmh8a27+Ons35K022WdhrHdgplR4KNwoEfDFr/GhT8n6Dw20HeLziXG6sLeEcLu4tVoRnc0BRn8k5DLjijMdgbagU17eCK/5X6r+DYhdcLx7p8u/PPRpd476Z57cH14GslVD3GEViY4BcRQj/stf1uOxwmfi/yB1G39xnTpNzsY/4Mt+9JdOV3/BbOkelD7to/siswFhlT8hRwxmS+mE8xZivUmopxXUQMYnNPJd1CGrvicWBfKLDVqshnbmb9AfRDGHZ7w37QD8Ke3+9ufEbXiMbf7NeDU3sQpAztgq5BmJrOgsu9+/lCdsgsjNtZm5uqI6pIq7s3fegwlXk0517VXq8MvaoY432tktemmtPuEkdjUXFXbLClPyqvV2+cp7H/SsNvam2+lHKW+iztqfePr9VImpudsv+l0jffoxMpZ5m8v6dPSn9A9ErfyLDj1qCxnR13+miQNHO0Ph9WTgtzIkE5t5ei1SxepS45sJpMJxQc9gZ+P9ywqyHQ7hXbXG9criKruI3egYPYYnStlXU80l8cLGemgURE6faXgVstxL4P/GbXZotlTKKu77tNW5sPShQZNCoYJ6P5ZLSauIyowWNVSEsiHzcZ9UPFjIpquVD5VZYXbqv/qbq5hpSjeJZweXOD8TBRf8pzw7Guy+3/JdoRbSBQit3h97ha9+gK5kpzeyDRwP2ptWZeD3f0MSb1Q7KQ4vC9mlvPs0n5ED9OR3HyGFTMfFYSZt/QJ0pqnyb4M/78qY7UStkxaNtkn8Wr29VikXwKamm3ryEPy8komc1v3TNMGzrtAbuBsyjxsKSicH4QQoWLXMf3o+Kve8rrd/Jy1GW9LSscHjUQH3BDMsS4S2Jy/BupZoz6UQgAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/cluster-797",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "907"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:17:53 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "72"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_provider_regions_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_provider_regions_1.json
index 71d58d30e6..845f9863d6 100644
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWPQWuDQBCF/8sePNmsSpJaQUooPaaE2tJDKWF0R7N03ZWdXQ8N/vdutIFCjvPNmzfvnZmS+ptY8XlmJ4stK9jJuYEKzhtlvLgTOK56ozsj6lVjeg6D5OAUEB8z3lnjB+Lbe1xnYt2mmzaHPGkeIM/yzbYOFp4cWuKDNaMUaLnFThpNj1KHncAn47UrnfUYXSVU7j6qyEm05T6JBujwxfdlGkmHPR3QHgIp0yRhMbOoQl5C1bLp6zKSV27pIjU50A1W8gcXAiNIBbXC1yXCDAW2EG5YcYkQMw09Bsf36vi8q96OKZvif5oWFN2Ksvn3H9wn83TtEkgoMyNnHKi5LivS6RfmOY5SdwEAAA==",
+  "Body": "H4sIAAAAAAAAAGWPwWrDMBBE/0UHn9xIdogbDKaE0mNKqFt6KCWsrbUjKktGK/nQ4H+v4jRQ6HHfzs7OnJlW5otY+XFmJ4cdK9nJ+5FKzlttg7yTOK0Ga3orm1VrBw6j4uA1EJ9y3jsbRuLFPRY5btebbZEVWb4RxboTLTTRIpBHR3x0dlISHXfYK2voQZm4k/hog/GVdwGTm4Sq3XudeIWu2otkhB6fw1BlifI40AHdIZIqE4KlzKGOeQl1x+bPy0hB+2sXZciDabFW33glMIHS0Gh8uUZYoMQO4g0rLxFSZmDA6PhWH5929esxY3P6R9OBpv+ifPn9C/dimW5dIollFuStB73UZWU2/wBdWMg4dwEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:38 GMT"
+      "Fri, 28 Mar 2025 05:07:16 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "67"
+      "54"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index d17ab06bb3..29fe937a66 100644
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:38 GMT"
+      "Fri, 28 Mar 2025 05:07:16 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_tenantUpgrade_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_tenantUpgrade_1.json
deleted file mode 100644
index 188b55e0a0..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_tenantUpgrade_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAANVWbW/iRhD+K9V+uC8N2IaACVJUkcBFVOFFGJo2VRWt7THssez6dtduScR/76xfGsjLqbqqrU7ig5nZmXnmmdmZfSI0MzKIKGdiTfpPJJK7NDNgP0HQkENM+gnlGs5IqiBmkWE5jF5oNNrDUP4uThWHMxIzvb25eiUOabTN0pduQnYthYDISPVWfAU0nitIQIGIECHREEkRU7Un6DLimTaglvvUqhaj+e34ehCMlgRVpVcmRWAU5qmtd22otUX3ZCfFWsZh33Fo1GgbvhVbr6E3qGy4Lv6aieRZtmHN6mAjhrwpwPRbvuv5Z28aeV9j1PqykfOD1vzSqAw+YNU2gcxUBJc03jHxQUHKWUQDMJfUcKob7JN8/Mxq58hCnXCg8uecv9cqx7wr8hrn7e57EAqOsQQGhtT2B2m5rU7DbTda3aXX7bf9fvvinpQVD9gj3FyRvtvslII7qhDkeiJja/lxdXv7y8PdYDEZDdECq6n2qS3PwCxAm7mSOYsBe4BMZ9MRnlhzGVJ+XYIMgCcTKuga4sAmVzRu1SJrJbN0bGva9eG8FZ8nXifp0Z4bXdBeq9fphuiNPes77QvfD1u+30186p9HUYx6TkPg2CO//obfTGzt5xPZYOeh3caYVBeMySwuuKl4auLNcWjKnIJ+J/earlPA0c57WGra9TH/xDY6L7qbJ0j6fxfZKW+lo7AGUsGPMtR/gTkJfhL4+PT/gVYLmuqNNH8H6/PZA9a20AyvJvSTVD+hd2xAtO417WWpdCfiZrdWrBbjb2hsHKFepTFe3vit29vp3B8dvGNmMyvupP6GMv1nA1LQnZ1Op3dRZLtiyiANHq5AmunjjcjMyx2WVsPr6s0NV2sRhakXUS2bluGXo+lgarfW+4t5R/8YCzvOI7CTlvRFxjnWjonX4kO1bdHL/DTQ4C6wwzdJoNjpx6bViYllhb0jV7DG7qgkq+BhNAiWD57dEhXTtnk+0nKZt0+kQQqRzePZCv/gROd7wyI9xSWBxLiIjSM0S2AlalsCmVTM7EnfLx8EM8H3tcXh8CpMObu/NPG9V0UuM9P4FknY+t/C+ShFTec9fn7nFSNJSWmuQZnqFTMOFjeL2Wz5swWJm3oQxzhu9Vet7+IBYOqYq/lwsBxPb1Bs6LpkaQsIF7dxjsKc8syegxYUwNA7tldBK7aRKV9TL7s7L6flAvmgGoI9Ytqhj9tlQA5/AqqxoZ1pCgAA",
-  "Status": 200,
-  "Method": "POST",
-  "Path": "/api/atlas/v1.0/groups/67e42d4f15f8a80c9a82856b/clusters/tenantUpgrade",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "930"
-    ],
-    "Content-Type": [
-      "application/json"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasLegacyClusterDescriptionResource::upgradeTenantCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ],
-    "X-Xgen-Up-Proto": [
-      "HTTP/2"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e62e8358616125063f0cab_clusters_tenantUpgrade_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e62e8358616125063f0cab_clusters_tenantUpgrade_1.json
new file mode 100644
index 0000000000..ed610e74c1
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e62e8358616125063f0cab_clusters_tenantUpgrade_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAANVWWW8jNwz+K8U87Etjz+H4WANB4cTewEV8wGM3bYoikEecsWJZGkia2XUC//dSczR2jkWxRVss4IcxKZIfP1KknhySGRlGhDOROP0nJ5K7NDNgP0GQNQfq9GPCNZw5qQLKIsNyGL3QaLSHofwsThWHM4cyvb2+fCVek2ibpS/drNmVFAIiI9Vb8RUQOlcQgwIRIUJHQyQFJWrvoMuIZ9qAWu5Tq1qM5jfjq0E4WjqoKr0yKUKjME9tvWtDrC26d3ZSJJKu+65LooYOku3jw6ahN6hseB7+musHSpMdbVYHGxTypgDTD7qe3z1708j/FqPg60buT1rzC6My+IBV24QyUxFcELpj4oOClLOIhGAuiOFEN/xz9oV6tXNkoU44VPlzzj9qlWPeFXmN7sfuexAKjrEEBobE9ocTeEG74bUaQW/ptftet+9375yy4iF7hOtLp+8126XgligEmUwktZafVjc3v93fDhaT0RAtsJpqn9ryDMwCtJkrmTMK2APOdDYd4YmEyzXhVyXIEHg8IYIkQEObXNG4VYskSmbp2Na004VOAL1Wu9fxO37Q9jqt2IvIGr2xI32763WCODrvAWmdRzFYojhZA8ce+f0P/GZiaz+fnA12HtptjEl1wZjMaMFNxVMTb45LUuYW9Lu53/TcAo5238NS066P+Xdso/Oiu3mMpP93kd3yVroKayAV/CzX+i8wJ8FPAh+f/j/QakFSvZHm72B9PnvA2haa4eWEPEj1C3rHBkTrXtP2QKU7ETc7tWK1GH9HY+MI9SqleHnpW7e31bo7OnjLzGZW3En9HWX6zwakIDs7nU7vosh2xZRBGnxcgSTTxxuRmZc7LK2G1+WbG67WIgpTL6JaNi3DL0fTwdRurfcX8458GQs7ziOwk9bpi4xzrB0Tr8WHatuil/lpoMFtaIdvHEOx049NqxMTywp7R64gwe6oJKvwfjQIl/e+3RIV07Z5PpFymbdOpGEKkc3j2Qr/4ETne8MiPcUlgcR4iI0jNEtgJWpZAplUzOydfrd8EMwE39cWh8OrMOXs/srE/xi/KnKZmca3SMySfwvnoxQ1nXf4+YNfjCQlpbkCZapXzDhcXC9ms+Wvvt3fKh9QiuNWf9P6Lh4Apo65mg8Hy/H0GsWGJCVLW0C4uI1zFOaEZ/YcBFAAQ+/YXgWt2EamfE297O68nJYL5INoCPeIaYc+bpahc/gTtdFAZWkKAAA=",
+  "Status": 200,
+  "Method": "POST",
+  "Path": "/api/atlas/v1.0/groups/67e62e8358616125063f0cab/clusters/tenantUpgrade",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "929"
+    ],
+    "Content-Type": [
+      "application/json"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:34 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasLegacyClusterDescriptionResource::upgradeTenantCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ],
+    "X-Xgen-Up-Proto": [
+      "HTTP/2"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_1.json
index 007e24781c..ce0a57bd7b 100644
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMSAcVg7dW+WVh0O+wyoBiPbpEPEv5coSlqWisXzPb17kn1XIs3sA7oXO4+B1FlCpEMIqEhNWMbKNMtTxt+OvM6rOhfvJCH9bcYrLJgq9LHUAkQmTyCYKHmzzk0/fnlSf1xJ51CvbBfC5GtKpbGzShVeDoMdW6uag7QDhamnEAx4emG0dXaePP3H7tCsSo9GkyWJsIJKOwboR3T+uW1j35j/wJFq7s+zq+WBxilREKABj2e/L2fLx2macF/LnYvU4KxE73FXx5ON0/Ld9QFN78OOll92+UzICAOu+OMPnafWgcIUGaanslh11rWvt8MvUSvggkGuGSqGlVJcKizI8gOP4LIrTAQAAA==",
+  "Body": "H4sIAAAAAAAAALWTPW/DIBBA/wuzHQgO2PLaqXuztOpwhvOHisECnA6R/3sdRUnrpfLCfE/vngR3JcrMIaJ/cbONpGYZUR4hoiY14YyLnBU5r96YqFlZH+U7ychwm8kSJceqEJU8yiMXTBYtU9CsczPYr0DqjyvpPbYr28c4hZpSZdysc42Xw+hs53RzUG6kMA0UooFAL5x23s1ToP/YPZpVGdC0ZMkSrKDK2QiDRR+e2zb2jfkPnKjm/jy7Wh5omhINERoIeA77crZ8mqYJ97XcuUQN3ikMAXd1PNk0Ld/9ENEMIe5o+WWXz4xYGHHFH3/oPHUeNObIMT+J1eZ893q7e4GtBllxKFqOmmOptVQaT2T5AQt33ZFLBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "286"
+      "285"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:35 GMT"
+      "Fri, 28 Mar 2025 05:07:15 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2298"
+      "928"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=241ebaaa923f8976e089f60cd8094828546f28c7; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_1.json
deleted file mode 100644
index 10d1d20b85..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UXU/bMBT9K5OfadOmHyl5CyVDndqCkjA2pgk58U3q4dqR7VYqiP/OddICZRraEw+V3HvvuV/nnjySnBb3mzqWNBfASFhSYeCE5HyqpITCKk3CRwLv3Boou9JQggZZAAmJgUJJRvWOPJ2QQmyMBZ3taudK4qv5bBqlcUbQ1WblSqZWc1kZzO4QmNDCOf4Q4Pf8Uac36PjjrD8OB0E4OL1FKOPmPuUPcHFGwl531BpuqF5jmoViDvn1ej7/eXcTJYv4HBHYm97VrlhkEzD2SqstZ4ATkeXlMsaISqicimnbbwqiXFBJK2DpimqGeV8GrrTa1DNcABkHMPTZsOyPygmd9IpTOvEno3GO2firfzQ4DYLcD4JxGdBgWBQM/YLmIHDiX7/xzeW9ez6SFe4RcStraxN6XiHUhnUYbLtrJSvF8m6h1h6tuUetoMbb+l7TjPH+1Ym33785PDrDwZg40kTDlCiRpM+q67X35Wncv9LwTeXmpZWj0kdl30Z/fq9G0tqslP2fTl9jn5DVxnN+tqB/lP6O2fH0ED3p9siL78jcdbxIunbHe0xWTTfmjeBqbt9LVEMteEEbLdVQtMf00Qn2Xa3NurltjO67FBWiUeklr1o8CFSnq7NPiZaydILdwkwaS1HtToNYZOFm4n/ZUMxui6idg9qW7XjRTerG0lxpbnckDNyfo4gsXkbLjBza2luv07s4SrO7frPgByVh9sGME9LG7MG3+PzSIrVSdgra7r9KszS5SC4vsx9uKziEPUCmSRxls+UFmpEN/Lg0G8ZhbPvdek/DtuUzwc1RA+kOOVxjmnmWkqdn0qoCE14FAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "635"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:38 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "992"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_1.json
new file mode 100644
index 0000000000..7dba24cbda
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e62e8358616125063f0cab_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U32/aMBD+VyY/FxJCSWjeUsgqJqBVkq5bpwk5ySV4NXZkGyRa9X/fOYGudOq0pz4gmbv77td3X55ITouHbRMLmnMoSVhRruGM5GwihYDCSEXCJwJv3ApoeaOgAgWiABISDYUUJVV78nxGCr7VBlS2b6wriW/ms0mUxhlBV5eVSZEaxUStMbtFYEIDU/whwHO9Uc8d9rxx5o5CNwgHwT1CS6YfUvYIV5ckdPujznBH1QbTLGRpkZ9v5/Pvq7soWcRTRGBvat/YYpFJQJsbJXesBJyILK+XMUbUXOaUT7p+U+DVggpaQ5muqSox78vAtZLbZoYLIH4Avgfj4WjsD/yBN3L9YeUWNMds7JV/FLi+VxXnY6DD86ICF/2c5sBx4h8/8c3Eg30+kTXuEXFrYxodOk7B5bbslbDrb6SoZZn3C7lxaMMcajjVzs5z2ma0814nzmH/+vjoBRcBsaTxlileIUkfVdfp7stRuH+p4IvM9UsrJ6VPyr6O/vhetaCNXkvzP53+iX1GVlvP9HJBf0n1FbPj6SF63LfsH3wn5r6PDkE39nhPyWroVr8SXMPMW4kqaDgraKulBorumP5xgheVrbXdtLeN0QObokY0Kr1idYcHjuq0dQ4p0VJVVrA7mAltKKrdahCLLOxM7C8bitluEbVzVNuyGy+6S+1YiknFzJ6Egf1zEpHFy2iZkWNbB+ttuoqjNFsN2gU/SgGz92fMz0kXcwDf4/NTh1RSmgkoc/gqzdLkKrm+zr4NEIFDmCNkksRRNlteoRnZwI9Lu2EcxnTfrbc07Do+E9wc1ZDukcMNpplnKXn+DQ+e4dVeBQAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62e8358616125063f0cab/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "636"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:07:16 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "625"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/memory.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/memory.json
index 21eff4f614..ef2d9a2150 100644
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/memory.json
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/memory.json
@@ -1 +1 @@
-{"clusterGenerateClusterName":"cluster-436"}
\ No newline at end of file
+{"clusterGenerateClusterName":"cluster-797"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json b/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
rename to test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_1.json
index 3ac4db4afa..0880ee87b3 100644
--- a/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:49:19 GMT"
+      "Fri, 28 Mar 2025 05:19:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "237"
+      "263"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json b/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
similarity index 83%
rename from test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
rename to test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
index 2dfde17564..d9e0e8e1c0 100644
--- a/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:49:18 GMT"
+      "Fri, 28 Mar 2025 05:19:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "144"
+      "111"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_1.json
new file mode 100644
index 0000000000..ba82c7bb80
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bOBD9lQWfE+vitZzqTbXVwAtfAktptikWAS2ObG4oUiApF27gf9+hqaRxigD70j4YoDmcM4ecOUdPhLI9lRWwiZI133aaWq4kSZ9I1RmrmlUL0hgx4e0OtD9TChPFJP36zwVpuORN1+SSbgQwDNxoZVWlBElJOS+ih5hcECvM6/SFYoDhaf4pu52X5HhBNrR67NoehKRWd4CbHI9LqKzSjg08R2sqDIY1UHajoQYNyB7xDFRKMqoPDrESSB50eWhdaJ3fzGeTrMhLZFN5VLxkYTWXW4PoLgMBLUzxhwlxGI8uw+FlfFWGozS8SqPkHlMZN48F/w7XH0kahYPQ79xRjc/wfK1Pt/P5l4e7bL3Ip5iC5PShddUyuwZj8X32nAFeiSxXyxxPbIXaUDHxhAsQ9YJKugVW7KhmiPty461WXTvDFyAjqBlNKNBhHQOLYcxYUkE4QjTu4skYkhiqcHSVREkUj8JkWEd/siHGBd2AML55gstHt3wiO3xIzNtZ25o0CCqhOnbJYD9olNwqthlUqgloywNqBTXBPg5OZEzwHpOgb4B5XlwmY+KaJk6dEjU26TeVDfx0BRpfX2n4S23MC5OzymdVX5/+7VSNpK3ZKft/iP44e3R6dJHpxwX9V+nPCH6SMrkahOQldrY9SDAgaeMm96xTLe3MK7W13L6Rp4ZW8OpkFkULlZ+jV9O3qc+nb/zBVeqa01jj6chBbDHbm4LPx8kXB8sr00MiojTW2ZOTHWIvorDX4Wx1U5B0GIaoQtiYz0p0DfR6L8psOc3WTn8SVTlRnbQkDVHltLOqqKg46QotTjVt5xT/s7+0GhhHm9hD/iZiMB+m6ps8Dxw9L+cNb9GOGAOBpuM2f8XVhkdHmCvN7YGkY/fH28zStza7K4i3zJUUh1/1uL6ffcnb4iHPivIhOs3ldyVh9r41faiIP9Mn3+PyD5+plbIT0LavPivW1+vVqvw7wgxkb59TJus8K2fLa/e9odve4XCc0ZpPQ+o+TN723/Zz7wWxxg5RA8UBRdAg4LwsyPE/qDCx7R8HAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "803"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:16 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "66"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_2.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_2.json
new file mode 100644
index 0000000000..9a2d90c589
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY8aNxD+K5U/5EsP9oWy3K10qgiQiAqOE7uXaxNVJ7MewD2vvbW9NOTEf894vSRwTar0QyKBBJ6ZZ8Yzzzx+IpTtqCyAjZRc802tqeVKkvSJFLWxqlxUII0RI15tQXufXJgoJum7Py9IySUv63Ii6UoAQ8OtVlYVSpCU5LMseojJBbHCnIbPFQM0jyevhneznBwuyIoWj3XVgpDU6hrwkKO7hMIq7aqBo3VNhUGzBspuNaxBA1aPeAYKJRnVe4dYCCwedL6vnGk5uZ1NR8NskmM1hUfFS2ZWc7kxDt1Y6mIRnpRKbhRbpUHQgnSSQcds0dgJQ/x0N5F8/3e3desw2HUl2DQehNHg4osh0f8Pif8rJPgVB3LtuvSC1nabqVoXcE0ZDuOFhkrwgmZgr6kV1HSiSFwl8giN9z9eNdO7z7f92ejd2Y2/nL9pLXbewhi/GB6Hcb8T9jrxZR720/AyjZK3mINx85jxD/D6JUmjsBv6k3uqscTj/F/dzWZ/PNwPl/PJGENwinpfubEM7RKMRSLtOAOcPblZ3EzQYyPUioqRLzEDsZ5TSTfAMnc1xP1EjY1WdTV1s+zDmtGEAu2tY2AxDBhLCgj7iMadPRlAEkMR9i+TKInifpj01tEvrId2QVcgjGe54PLR/XwiW2Qcxm2trUzTL1Wzpjlto7qFKgNa8aBpfrCLg6YYE3ytkmPLzUnviWO3aCgt1tjyH5Q28GsYaOy+0vCbWplPlZxlPst66v3DSzWSVmar7LcU+tn34ITLWcYv5/Qvpd8geKN55LLrNqS1nR13EzRIWjrmnk2qorU5kaWK22c61m5kIzgVFJ5HJ+xbrc/ZN7hymeqyoTV6Rw5ig9FePX08Ml/sLS9MC4mI0i12AW7tEHsehe0eThe3GUl7YYhbCCvzRom6hFYYs3x4Mx4u3f5J3MqRqqUlaYhbjsKisoKKZq/wLVBlVbuN/7cQVxoYRz3dweSZxWA8jNU/8txw8HU5bXiOdkAbCFRnd/g9rtY7uIK50tzuSTpwf7zM3PjRDu8z4t+WhRT779VcP8825V32MBlm+UPU8PKDkjD9ujRdFcT7tMFv8edPPlIrZUegbZt9mi1fLxeL/PfIa749hkzHM6emlm5adUMqoyw3BHWvt38bn89y55dhidOhBrI9LkCJYLM8I4ePQ+OzgUQIAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "902"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:16:03 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "65"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_3.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_3.json
new file mode 100644
index 0000000000..508b7a9f13
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW8iNxD+K5U/3JcG9oWyJCtFFQdcRMVLxG4u7VVVZNYDuPHaW9tLy0X8947XSy6kd1X74U4CCTwzz4xnnnn8RCjbU1kAGym54dtaU8uVJOkTKWpjVbmsQBojRrzagfY+uTBRTNJff7sgJZe8rMuJpGsBDA23WllVKEFSks+y6CEmF8QK8zJ8rhigeTx5N7yb5eR4Qda0eKyrFoSkGyoM4ClHfwmFVdqVA6/MGii71bABDVg+AhoolGRUHxxkIbB60PmhcqbV5HY2HQ2zSY7lFB4Vb5lZzeXWOHRjqYtFeFIquVVsnQZBC9JJBh2zQ2MnDPHT3Ubyrz+6rVuHwb4rwabxIIwGF58Nif5/SPxvIcGPOJFrq2t4Q2u7y1StC7imDKfxRkMleEEzsNfUCmo6USSuEnmCxvufrprp/afbfm/0/uzGn8/ftBY7b2GMXwyPw7jfCXud+DIP+2l4mUbJB8zBuHnM+Ee4eUvSKOyG/uSeaizxRIB3d7PZLw/3w9V8MsYQnKI+VG4sQ7sCY5FJe84AZ08Wy8UEPbZCrakY+RIzEJs5lXQLLHNXQ9xnamy1qqupm2UfNowmFGhvEwOLYcBYUkDYRzTu7MkAkhiKsH+ZREkU98Okt4l+YD20C7oGYTzNBZeP7ucT2SHjMG5nbWWafqmaNc1pG9UtVBnQigdN84N9HDTFmOBLlZxabl70njh2i4bSYoMt/0ZpA7+HgcbuKw0/qbV5ruQs81nWl97fvFQjaWV2yv6XQj/5Hp1yOcv47Zz+rvR7BG9Ej1x23Ya0trPjboIGSUvH3LNJVbQ2L2Sp4vZZyNyGurqajWwEp4LC8+gF+9abc/YNrlymumxojd6Rg9hitJdPH4/MFwfLC9NCIqJ0i12AWzvEnkdhu4fT5W1G0l4Y4hbC2rxXoi6hFcYsHy7Gw5XbP4lbOVK1tCQNcctRWFRWUNHsFT4Gqqxqt/H/FOJKA+Oop3t4reAG42Gs/pTnhqOvy2nDa7Qj2kCgOrvDr3G13tEVzJXm9kDSgfvjZWbhRzu8z4h/W5ZSHL5Wc/0825R32cNkmOUPUcPLj0rC9MvSdFUQ79MGf8Cf3/lIrZQdgbZt9mm2ulktl/nPkdd8ewoZT2aTfLq4cS8z3bYKh3RGaW5I6p5w/z6+nufeL8QKJ0QNZAdcghIBZ3lGjn8DekGy0kkIAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "908"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:19:32 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "73"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_4.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_4.json
similarity index 81%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_4.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_4.json
index 5266b31f93..16f27c1ca0 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_4.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItOTEgZXhpc3RzIGluIGdyb3VwIDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNS4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJDTFVTVEVSX05PVF9GT1VORCIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci05MSIsIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSJdLCJyZWFzb24iOiJOb3QgRm91bmQifQ==",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItNjcgZXhpc3RzIGluIGdyb3VwIDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNS4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJDTFVTVEVSX05PVF9GT1VORCIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci02NyIsIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSJdLCJyZWFzb24iOiJOb3QgRm91bmQifQ==",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67",
   "Headers": {
     "Content-Length": [
       "202"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:51:28 GMT"
+      "Fri, 28 Mar 2025 05:21:30 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "69"
+      "57"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_1.json
index 65af8ab4f2..dbd2fffe40 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAMVSsW7bMBD9Fw6ZLFOSbVISYBRpu3QJjDpogRQdaPFkE5FEljwaVYP8e09SncZLxnYj796998h7T6w1/WNg1bcndvLQsIqdEF2oOK9bG3Wi4bzsbH+0+rCsbceVM1xhqwI/5/zobXSBb6DRSihQqyYHnYPUWtSQbogiBgQfLoekzPhB1Y/R8dArF04WwzvTU1fDBxt73KKPcOPUEe5it81uDEIXduB3VNlmacoWzENLJgO0DXv+Pl5DbHF+wOR45+3ZaPAEuv26p4HauuEzHI3tRxSN1B4Ugr5FguRpvknSVZKL+0xU66JKywea0RBqbxzSEIEQAiYXw9SFn86Q7jWBnAjKKluNBI2HHxH6ergfHBDM9ho61WtqGU13IWGdN0KUUh5yKUUjlSyyUlL/fy+Ev+Ht9ecv/pHBF9krmSuJP+ApEHP9C3HMyyuW6VIQh7OtqYdPY6DmGHhwVFF7wDvVjTu6krx8x8v+Pl72F1BhDCPedq4FStJUtJ4yuje/4P1AeWFVtlnLtSiKNF0wnEn+Kk5O0aJqp9gT+vk3EaW1zIoDAAA=",
+  "Body": "H4sIAAAAAAAAAMVSTY/TMBD9Lz7sqakTp/lopAotcOGyqugKpEUcvPaktTaJjT2uCKv970wSutALR7jFM2/ee5l5z6wzw1NgzZdndvLQsoadEF1oOFedjTrRcF73djha/bhWtufSGS6xk4GfBT96G13gBbRalhJk3grQAiqtSwVpQRQxIPhw+UjKij9K9RQdD4N04WQxvDEDdTW8s3HAHfoIN04e4S72u+zGIPRhD35PlV2WpmzFPHRkMkDXspev0zPEDpcfmB3vvT0bDZ5At58PNKCsGz/C0dhhQtGI8iAR9C0SRKSiSNI8EfV9WjRZ3WT5A81oCMobhzREIISAycUwdeG7M6R7TbCdCbaNqCaC1sO3CIMa70cHBLODhl4OmlpG07usoMzT7aZKS9GqTU2728C2qKn/vw/C/+Ltz+Wv/pHBV9krmSuJX+A5EEv9E3Esx6vX6bokDmc7o8YPU6CWGHhwVJEHwDvZTze6krys4/V+7y/3Cygxhglve9cBJWkuWk8ZPZgf8HakvLAmKzZ5XZSZqFcMF5LfirNTtCi7OfaEfvkJJ77lX4oDAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:49:17 GMT"
+      "Fri, 28 Mar 2025 05:19:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "88"
+      "68"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
index ec24a005ca..234f1a453d 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsXICIRT8F+o7OVEhXpdMmjQpolUyKRAeJ+MdEOCcXBz/Pc/RM2OT0g52l7f7ZjkQ5cPwBo31LpH647MgGpKKNmRESE0ypFwmJ0Pa+kwKAt/BRkiPGTlWsUVZzUom1lNez3k9q95RYiJ89eDUsB4CoMw7DZ10Gimr8c4FzJnhfCnEhgnBjZDiYboUyLfW7U4xDmQbwaB2m3NINaWq9b0uNewnnXeN15uJ8h2VwVKZW5nontEm+j4kugCjJZcgZ4aBZiC05gqqBY7oU4aYxkO5nNKNVLs+0HG/RP/JFqHFQAlaQ47FnQJebW9sbiwuYnLE6oJvrRpeMnSXLiMEROQK8qvsTl3cjB7Xvvb0PPaUssw9ziBYZA9nxEfZwMr+wNOAn4LUVUHy+eGfCzn+AkUe3nBRAgAA",
+  "Body": "H4sIAAAAAAAAAL1Su3LCMBD8F9U2UoQf4C6ZNGlSBKpkUgjpbDTYkqIHE4fh33MMmAxNSjrpdrW7N6sDkdaNb9BpawJpPj4zoiBIr13ECWlIhBDzYIQLWxtJRuDbaQ/hMSLGGS9zNs/5cs3K5qFqWPGOlNbDVwIjx/XoAGnWKBiEUQhphfeqhmrOlkXNKt7KYgFiXsCyXCDea7M7xTiQrYcWudsYXWgolb1NKlewnw3WdFZtZtIOVDhNRexFoHtOO2+TC7SEVolKoGjLQXGolaoksBIlUojgw3TIq5puhNwlR6f9Av0nm4ceAwXoW3LM7hTwantjc2NxIZMjVudsr+X4EmG4dOnB4USsIL6K4dTFjfS09rWn56mnEEVMqEGwyATnifWig5X+gacRPwVpWEbi+eGfCzn+AqeySkRRAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:31 GMT"
+      "Fri, 28 Mar 2025 05:16:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "47"
+      "67"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_2.json
similarity index 60%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_2.json
index dfe2597ee2..2992794e82 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SwVLDIBT8F85JSWkLNjcdL14cx/ak44HCI2WaAPJIx9jpv0u1qdOLR2+wu7zdN8uBKB+GZ2isd0jq17eCaEAVbUgZITVJgKlEJwNufSIFgY9gI+Btyhyr2KKsZiUT6ymv57yeVS9ZYiK89+DUsB4CZJl3GjrpdKaszncuYM4M50shNkwIboQUN9OlyHxr3e4U40C2EUzWblMKWFOqWt/rUsN+0nnXeL2ZKN9RGSyVqZVI94w20fcB6QKMllyCnBkGmoHQmiuoFnlEjwkijodyOaUbqXZ9oON+SP/IFqHNgRBaQ47FPwW82F7ZXFmcxeSYqwu+tWp4SNCdu4wQMiJXkB5ld+riavS49qWn+7EnTDL1eQax7in6JheO36iPsoGV/YS7IX8MUlcFST+Pf53I8Quwvl/dVQIAAA==",
+  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56T2qT5aLOBWFgQop1ADK79klpNbOPnVISq/51XaIq6MLLZ785393Q+MOX8+AytcRZZ/fqWMA2ogvGRJqxmETCmaKXHrYssYfDhTQC8jYRlIitSMU+z5VoU9U1Zi/yFKE2A9wGsGtejB6I5q6GXVhNkNN3LCsq5WOaVKLNG5QuQ8xyWxYLwztjdKcaBbQM0xN3G6LHmXHVu0KmG/ax3tnV6M1Ou59IbLmMnke8z3gY3eOQFNFqWkkSbDHQGldalAlGQxIARAk6HtKz4Rqrd4Pm0H/I/sgXoKBBC17Bj8k8BL7ZXNlcWZzI7UnXedUaNDxH6c5cBPE3kCuKj7E9dXElPa196up96wijjQBrM2KfgWiocv6cuyBZW5hPuRvoYrBYJiz+Pf53Y8QusKNJFVQIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:35 GMT"
+      "Fri, 28 Mar 2025 05:16:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "61"
+      "59"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_3.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_3.json
similarity index 60%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_3.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_3.json
index b8f35797ac..905b318fe0 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_3.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SwVLDIBT8F85JSGkLbW46Xrw4ju140PFA4SVlmgAC6Rg7/XdfbaPTi0dvsG/ZXVgORDk/PEFjnI2ken3LiIaogvEJEVKRBDHl0Uofty6RjMCHNwHiTcIZK9k8L6c5E+sJr2a8mpYvSKkDvPdg1bAePCDNWQ2dtBpHRuOeC5ixmvOlEBsmBK+FFIvJUuC8NXZ3inEg2wA1crcp+VhRqlrX61zDvuicbZzeFMp1VHpDZWplpHtGm+B6H+kcai25BDmtGWgGQmuuoJyjRB8ThDgu8uWEbqTa9Z6O94v0j2wBWgwUoa3JMfungD+2VzZXFhcyOWJ1Z/wZNc7lLYqy4KjhXWvUcJ+gu3QcwCMiV5AeZHfq6MpyfI6f/u7G/mKSqUcNYuxjcA1+hPiNuiAbWJlPuB3ww5CqzEg6H/51IscvTTHtuW0CAAA=",
+  "Body": "H4sIAAAAAAAAAL1SwVLDIBT8F85JwDQhbW46Xrw4ju140PFA4SVlmgAC6Rg7/XdfbVOnF4/eYN+yu7DsibRufIZWWxNI/faeEAVBeu0iIqQmEUJMgxEubGwkCYFPpz2E24iznOVlymZpvlixsr7hNStekdJ4+BjAyHE1OkCaNQp6YRSOtMI9r4DP2KKoGM8bWcxBzApYlHOcd9psjzH2ZOOhQe4mRhdqSmVnB5Uq2GW9Na1V60zangqnqYidCHSX09bbwQVaQqMEFyja5KByqJTiEliJEkOI4MO0SHlF10JuB0en+wX6RzYPHQYK0DXkkPxTwIvtlc2VxZlMDljdCX9BjVN584xlHDWc7bQcHyL05449OETEEuKj6I8dXVlOz3Hp737qL0QRB9Qg2jx52+JHCD+o9aKFpf6CuxE/DKlZQuLp8K8TOXwDw2rWG20CAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:48 GMT"
+      "Fri, 28 Mar 2025 05:16:21 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "43"
+      "50"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_4.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_4.json
new file mode 100644
index 0000000000..0867550f3e
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_4.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL1SsU7DMBT8F89JbNLEabMVsbAgRCuQQAyu/ZJaTWxjOxWh6r/z2tKiLoxszr3z3Tn3dkR2dlCP3m61Ak9qMn9ZkIRI68YnaLU1gdRv7wlREKTXLiKCpAghpsEIF9Y2Ih0+nfYQ5hFnOcvLlE3SfLZkZX3Da1a8IqXx8DGAkeNydIA0axT0wigcaYXfvAI+YbOiYjxvZDEFMSlgVk5x3mmzOcTYkbWHBrnrGF2oKT1mTxVss96a1qpVJm1PhdNUxE4Eus1p6+3gAi2hUYILFG1yUDlUSnEJrESJIUTw4XxIeUVXQm4GR8/vC/SPbB46DBSga8g++aeAF9srmyuLHzLZY3Un/Bk1TuVNM5Zx1HC203K8j9D/dOzBISIWEB9Ef+joyvL8Oy793Z37C1HEATWINrhILS5COKLWixYW+gtuR1wYUrOExNPlXyey/wat+jLmgwIAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "352"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:18:14 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "79"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_5.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_5.json
new file mode 100644
index 0000000000..ea5d297f8c
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_5.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL1Sy07DMBD8F5+bOnUSJ82tiAsXhGgFEoiDa29aq0lsbKciVP13Nn2hXDhys3fHM7OePRBZm049ObPXChwpyeJ1SSZEGts/w0ab1pPy/QMLDkQAtQgIYTHLojiJWLGKs3JWlLPkDd8o8NJpG/ARggL4EPlWWL81AbvwZbUDPyaYnwjmJcsHgsrBZwet7Fe9BYSZVkEjWoUtrfDOc+BJPE/zmLNKpgWIJIV5VmC/1u1ucHogWwcVYrchWF9SehovUrCfNqbdGLWeStNQYTUVoRae7hndONNZTzOolOACSSsGikGuFJcQZ0jR+QDOXw8Rz+layF1n6XU+T//w5qBGQx7qihwn/2TwJjuSGUlcwOSI6Z7rL8hxDq+YxlOOHNbUWvYPAZrLGjiwWBFLCI+iGTIaSV6/45bf/TU/H0To/IA3ja0BN+lUNE5sYKm/4a7HfSHlLEuTIuMzVkxIOJP8KpLjD09t7OWuAgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "372"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:19:29 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "54"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_6.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_6.json
new file mode 100644
index 0000000000..ceae9d669f
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_6.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL1Sy07DMBD8F5+bOnUSJ82tiAsXhGgFEoiDa29aq0lsbKciVP13Nn2hXDhys3fHM7OePRBZm049ObPXChwpyeJ1SSZEGts/w0ab1pPy/QMLDkQAtQgIYTHLojiJWLGKs3JWlLPkDd8o8NJpG/ARggL4EPlWWL81AbvwZbUDPyaYnwjmJcsHgsrBZwet7Fe9BYSZVkEjWoUtrfDOc+BJPE/zmLNKpgWIJIV5VmC/1u1ucHogWwcVYrchWF9SehovUrCfNqbdGLWeStNQYTUVoRae7hndONNZTzOolOACSSsGikGuFJcQZ0jR+QDOXw8Rz+layF1n6XU+T//w5qBGQx7qihwn/2TwJjuSGUlcwOSI6Z7rL8hxDq+YxlOOHNbUWvYPAZrLGjiwWBFLCI+iGTIaSV6/45bf/TU/H0To/IA3ja0BN+lUNE5sYKm/4a7HfSHlLEuTIuMzVkxIOJP8KpLjD09t7OWuAgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "372"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:19:30 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "62"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
deleted file mode 100644
index 59cdb66dc7..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXVx7aR6U201cOFLYCnNbheLgCLHNjcUKZCUCzfwv3doKtk4iwL70j4YoDmcM4ecOUdPhPI9VQz4RKuN2HaGOqEVyZ4I66zTzaoFZa2ciHYHJpyppE1Skv319wVphBJN1xSK1hI4Bm6NdpppSTJSzcvkISUXxEn7On2hOWB4WnzK7+YVOV6QmrLHru1BSOZMB7gp8LgC5rTxbOA5uqHSYtgA5bcGNmAA2SOeBaYVp+bgEZlE8mCqQ+tD6+J2PpvkZVEhGxZQ8ZKlM0JtLaL7DAR0MMUfJqRxOrqMh5fpuErG2fAqe3/9FVO5sI+l+A43H0mWxIM47NxTg8/wfK1Pd/P5nw/3+XpRTDEFyZlD66vlbg3W4fvsBQe8ElmulgWe2EpdUzkJhEuQmwVVdAu83FHDEfflxluju3aGL0BGsOF0TIEONynwFK44HzOIR4gmfHx8Be9TPmKU13Q8Sob0mo021+B7IWkN0obmSaEe/fKJ7PAhMW/nXGuzKGJSd/ySw37QaLXVvB4w3US0FRF1ktpon0YnMjb6GZOob4B9Xlx+SIhvmjx1Sm6wSb+pbBSmKzL4+trAZ13bFyZnlc+qvj7926laRVu70+7/EP337NHr0UemHxf0H22+IPhJyuR6EJOX2Nn2YIwBRRs/uWedamlnX6mtFe6NPA20UrCTWZQtsDBHr6evPp++mPlKXXMaazydeIgtZgdTCPk4+fLgBLM9JCIq67w9edkh9iKJex3OVrclyYZxjCqE2n7Rsmug13tZ5ctpvvb6U6jKie6UI1mMKqed0yWj8qQrtDjdtJ1X/H/9pTXABdrEHoo3EYv5MNXf1HngGHh5b3iLdsQYSDQdv/krrjY8esJCG+EOJLvyf4LNLENr8/uSBMtcKXn4VY8b+tmXvCsfirysHpLTXH7XCmY/t6bxhoQzffJXXL4LmUZrNwHj+uqzcn2zXq2qP/yQInv3nDJZF3k1W9747w3d9g6H44zWfBpS/2EKtv+2n/sgiDV2iFooDyiCBgHnVUmOPwA+YNlFHwcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "802"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "83"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_2.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_2.json
deleted file mode 100644
index f874f47df0..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbY8aNxD+K5U/5EsP9oUA15VOFQESUcFxYvdybaroZOxhcc5rb2wvDXfiv3e8uyRwTar2QyKBBJ6ZZ8Yzzzx+IpTvqGLAx1ptRF4Z6oRWJHkirLJOF8sSlLVyLMotmMYnkzaKSfLn+wtSCCWKqpgqupbA0XBjtNNMS5KQbJ5G9zG5IE7a0/CF5oDmyfT16HaekcMFWVP2UJUtCEmcqQAPBborYE4bXw0crRsqLZoNUH5jYAMGsHrEs8C04tTsPSKTWDyYbF9602p6M5+NR+k0w2pYg4qXTJ0RKrce3TrqYxGeFFrlmq+TIGhBOr9EHbtFYycM8dPNI/XpY7d163DYdRW4JB6G0fDiqyHR/w+J/y0k+BUHcuW79IJWbpvqyjC4ohyH8cJAKQWjKbgr6iS1ncf8k7LhERrvf7xqanZfbvuzNbuzG389f91a7LyDCX4xPA7jfifsdeJBFg2S3jB5efkOc3BhH1LxCG9ekSQKu2FzckcNlnic/+vb+fyP+7vRajGdYAhO0exLP5aRW4F1SKSd4ICzJ9fL6yl65FKvqRw3JaYgNwuqaA489VdD3M/UyI2uypmfZR82nA4o0N4mBh7DkPMBg7CPaMLbB0N4GfM+o3xNB/2oRy9Zf3MJnrSSrkHahuVSqAf/84lskXEYt3WutHW/dMXr5rSN6jJdBLQUQd38YBcHdTE2+FYlx5bbk94Tz25ZU1pusOU/KG3QrGFgsPvawG96bT9Xcpb5LOup9w8v1Spa2q12/6XQL74HL1zeMnm1oB+0eYvgteaRy67fkNZ2dtwdoEHRwjP3bFIlreyJLJXCPdOxdiNrwSmBNTw6Zd/6nH0h85mqoqY1ekceIsfoRj2beGS+3DvBbAuJiMovNgO/doi9iMJ2D2fLm5QkvTDELYS1fatlVUArjGk2up6MVn7/FG7lWFfKkSTELUdh0Smjst4rfAt0UVZ+4/8pxKUBLlBPdzB9ZrEYDxP9lzo3HJq6vDY8RzugDSSqsz/8HlfrHXzBQhvh9iQZ+j+NzFw3ox3dpaR5W5ZK7r9Xc5t5tilv0/vpKM3uo5qXj1rB7NvSNNiQxqcNfoc/f2oijdZuDMa12Wfp6s1qucx+jxrNd8eQ2WTu1dTRvFU3pDLKck1Q/3o3b+PzWe6aZVjhdKiFdI8LUCDYPEvJ4W/y/yaORAgAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "901"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:46:30 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "83"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_3.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_3.json
deleted file mode 100644
index f1cd384e60..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW/bNhD+KwM/9Mti68W1nQkIBtd2Aw9+CSyl2ToUASWeZTUUqZKUVyfwf99RlFM7a4ftQwvYgM27e+5499zDJ0LZjooM2FiKTZHXippCChI9kazWRparCoTWfFxUW1DOJ+E6CEn054cLUhaiKOtyKmjKgaHhRkkjM8lJRJJ5HNyH5IIYrk/DF5IBmifTt6PbeUIOFySl2UNdtSAk2lCuAU8L9BeQGalsOfDCrICyGwUbUIDlI6CGTApG1d5CZhyrB5XsK2taT2/ms/EoniZYTuZQ8ZaxUYXItUXXhtpYhCelFLlkaeR5LUjnl6Cjt2js+D5+unkgPn/qtm4dBruuABOFQz8YXnw1JPj/IeG/hXi/4kSujKrhFa3NNpa1yuCKMpzGKwUVLzIag7mihlPdecw/C+0fofH+x6vGavfltj9rtTu78dfzN63FzhuY4BfDQz/sd/xeJxwkwSDqDaPXl+8xByv0Q1w8wvUbEgV+13cnd1RhiUcCvL2dz/+4vxutF9MJhuAU1b6yYxmZNWiDTNoVDHD2ZLlaTtEj5zKlfOxKjIFvFlTQHFhsr4a4z9TIlayrmZ1lHzaMDijQ3iYEFsKQsUEGfh/RCmsfDOF1yPoZZSkd9IMevcz6m0uwrOU0Ba4dzXkhHuzPJ7JFxmHc1phKN/2SNWua0zaqm8nSo1XhNc33dqHXFKO9b1VybLk+6T2x7OYNpfkGW/6D0npuDz2F3ZcKfpOpfq7kLPNZ1lPvH16qFrTSW2n+S6FffA9Wuaxl8mZBP0r1DsEb0SOXXbshre3suDtAg6ClZe7ZpCpa6xNZqgrzLGR2Q21dzUY2glNB5nh0yr70nH1+ZjPVZUNr9A4sRI7RTj5dPDKf702R6RYSEYVd7Azs2iH2IvDbPZytbmIS9XwftxBS/U7yuoRWGONktJyM1nb/BG7lWNbCkMjHLUdhkXFGebNX+BjIsqrtxv9TiCsFrEA93cFLBdcYDxP5lzg3HFxdVhteoh3QBhzV2R5+j6v1DrbgQqrC7Ek0tH+czCzdaEd3MXFvy0rw/fdqrptnm/I2vp+O4uQ+aHj5KAXMvi1Ngw1xPm3we/z5k4tUUpoxKNNmn8Xr6/VqlfweOM03x5DJdD5NZstr+zLTvFU4pDNKc0NS+4S79/HlPHduIdY4Iaoh3uMSlAg4T2Jy+BtfUcn+SQgAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "907"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:49:20 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "109"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_4.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_4.json
deleted file mode 100644
index bd6b49ad46..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_4.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOHVbu81WxMKCEK1AAjG49ktqNYmN7VSEqv+d148UdWFkc+6d7865tyeqtp1+8nZnNHhSkMXrkiREWdc/Q2VsG0jx/pEQDUF54yIiSIoQYhpa6cLGRqTDlzMewiLijOVsmubjlInViBcTXozzN6SUHj47aFW/6h0gzbYaGtlqHBmN31zAhJWcz4VYMyF4KaSYjeYC57Vpt8cYe7LxUCJ3E6MLBaWn7KmGXdbYtrJ6nSnbUOkMlbGWge4YrbztXKBTKLXkEuS4ZKAZCK25gnyKEl2I4MNwSOcjupZq2zk6vC/QP7J5qDFQgLokh+SfAl5tb2xuLC5kcsDqzvgLapzLm2V5xlHD2dqo/iFCc+nYg0NELiE+yubY0Y3l8Duu/d0P/YUoY4caxLS4SBUuQjih1ssKluYb7npcGFLkCYnny79O5PADI6EJRIMCAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "353"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:48:13 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "82"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_5.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_5.json
deleted file mode 100644
index b66ede3214..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_5.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1SsW7CMBD9F88EJwbsJBtVly5VVVArtepg4gtYJLFrO6gp4t97AUKVpWM3++75vXd+dyRFZVr15MxBK3AkJ8vXFZmQwtjuGbbaNJ7k7x9YcCADqGVACIvZIopnEePrhOfzNI+zN3yjwBdO24CPEBTAh8g30vqdCdiFL6sd+DGBOBNkeTLrCUoHny00RbfuLCDMNApq2ShsaYV3LmDOSs4zITZMCF4KKdIkE9ivdLPvnR7JzkGJ2F0I1ueUnseLFBymtWm2Rm2mhamptJrKUElPD4xunWmtpwsoleQS5KxkoBgIpXgB8QIpWh/A+eEQZQndyGLfWjrM5+kf3hxUaMhDVZLT5J8M3mRHMiOJK5icMN1L/QU5LuGl03jKkcOaShfdQ4D6ugYOLFbkCsKjrPuMRpLDd9zyux/y80GG1vd4U9sKcJPORePkFlb6G+463BeSJ4u5mPM0jeMJCReSX0Vy+gGT6QthrgIAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "373"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:49:16 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "66"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_6.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_6.json
deleted file mode 100644
index 34bcb5ac1e..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_6.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1SsW7CMBD9F88EJwbsJBtVly5VVVArtepg4gtYJLFrO6gp4t97AUKVpWM3++75vXd+dyRFZVr15MxBK3AkJ8vXFZmQwtjuGbbaNJ7k7x9YcCADqGVACIvZIopnEePrhOfzNI+zN3yjwBdO24CPEBTAh8g30vqdCdiFL6sd+DGBOBNkeTLrCUoHny00RbfuLCDMNApq2ShsaYV3LmDOSs4zITZMCF4KKdIkE9ivdLPvnR7JzkGJ2F0I1ueUnseLFBymtWm2Rm2mhamptJrKUElPD4xunWmtpwsoleQS5KxkoBgIpXgB8QIpWh/A+eEQZQndyGLfWjrM5+kf3hxUaMhDVZLT5J8M3mRHMiOJK5icMN1L/QU5LuGl03jKkcOaShfdQ4D6ugYOLFbkCsKjrPuMRpLDd9zyux/y80GG1vd4U9sKcJPORePkFlb6G+463BeSJ4u5mPM0jeMJCReSX0Vy+gGT6QthrgIAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "373"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:49:18 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "68"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_1.json
similarity index 77%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_1.json
index d1a2fee1d4..b6f397defa 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci05MSBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTkxIl0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci02NyBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTY3Il0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-91/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-67/backup/snapshots",
   "Headers": {
     "Content-Length": [
       "185"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:49:17 GMT"
+      "Fri, 28 Mar 2025 05:19:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "60"
+      "47"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
index e5d999f678..6b74009c58 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci05MSBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTkxIl0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci02NyBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTY3Il0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
   "Headers": {
     "Content-Length": [
       "185"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:46:31 GMT"
+      "Fri, 28 Mar 2025 05:16:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "47"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_2.json
similarity index 76%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_2.json
index 613dff14f8..ccda8c6626 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-67_backup_snapshots_67e630947062fc48ea34e958_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci05MSBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTkxIl0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci02NyBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTY3Il0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-67/backup/snapshots/67e630947062fc48ea34e958",
   "Headers": {
     "Content-Length": [
       "185"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:49:18 GMT"
+      "Fri, 28 Mar 2025 05:19:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "63"
+      "50"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index aa2c67ee9e..fc474c918d 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:47 GMT"
+      "Fri, 28 Mar 2025 05:08:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json b/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
index 836d117cf9..fa83037299 100644
--- a/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXVx7aR6U201cOFLYCnNbheLgCJHNjcUKZCUCzfwv3doOtk4iwL70j4YoDkzZw5n5oyeCOU7qhjwiVaN2PSGOqEVyZ4I663T7aoDZa2ciG4LJvhU0iYpyf76+4K0Qom2bwtFawkcDbdGO820JBmp5mXykJIL4qR9Hb7QHNA8LT7ld/OKHC5ITdlj351ASOZMD3gp0F0Bc9p4NvBsbai0aDZA+a2BBgwge8SzwLTi1Ow9IpNIHky177xpXdzOZ5O8LCpkwwIqPrJ0RqiNRXQfgYAOpvjDgDROR5fx8DIdV8k4G15l76+/YigX9rEU3+HmI8mSeBCHm3tqsAzPz/p0N5//+XCfrxfFFEOQnNl3Plvu1mAd1mcnOOCTyHK1LNBjI3VN5SQQLkE2C6roBni5pYYj7suLN0b33QwrQEbQcDqmQIdNCjyFK87HDOIRoglvH1/B+5SPGOU1HY+SIb1mo+YafC8krUHa0Dwp1KM/PpEtFhLjts51NosiJnXPLznsBq1WG83rAdNtRDsRUSepjXZpdCRjo58xiU4NsM+Hyw8J8U2Tx07JBpv0m9JGYboig9XXBj7r2r4wOct8lvW192+nahXt7Fa7/0P0X9+D16O3TD8u6D/afEHwo5TJ9SAmL7az68EYDYq2fnLPOtXR3r5SWyfcG3ka6KRgx2VRdsDCHL2evvp8+mLmM/XtcazRO/EQG4wOSyHE4+TLvRPMniARUVnn15OXHWIvkvikw9nqtiTZMI5RhVDbL1r2LZz0Xlb5cpqvvf4UqnKie+VIFqPKae90yag86gpXnG673iv+v/ulM8AFrokdFG8sFuNhqr+pc8Mh8PK74S3aAW0gcen4y1/xtOHBExbaCLcn2ZX/E9bMMrQ2vy9JWJkrJfe/qrihn6eUd+VDkZfVQ3Kcy+9aweznq2nckOBzCv6Kx3ch0mjtJmDcKfusXN+sV6vqDz+kyN49h0zWRV7Nljf+ewN+IR9H03+OwrJ/28VdkMEa+0ItlHsc/RZh5lVJDj8AQfuadRUHAAA=",
+  "Body": "H4sIAAAAAAAAAL1V227jNhD9lYLPiXVxLWf1prW1gQtfAkvZtFsUAU2ObDYUKZCUF97A/96h6aRxigX6svtggObMnDmcmTN6JpTvqWLAJ1o1Ytsb6oRWJH8mrLdOt6sOlLVyIrodmOBTS5ukJP/zryvSCiXavi0V3UjgaLgz2mmmJclJPa+Sx5RcESft2/CF5oDmafmpuJ/X5HhFNpQ99d0ZhOTO9ICXAt0VMKeNZwMv1oZKi2YDlN8ZaMAAskc8C0wrTs3BIzKJ5MHUh86b1uXdfDYpqrJGNiyg4iMrZ4TaWkT3EQjoYIo/DEjjdHQdD6/Tmzoe5fFNnmRfMJQL+1SJb3D7keRJPIjDzQM1WIaXZ326n8//eHwo1otyiiFIzhw6n61wa7AO67MXHPBJZLlaluixlXpD5SQQrkA2C6roFni1o4Yj7uuLt0b33QwrQEbQcJpRoMMmBZ7CmPOMQTxCNOHt2RiyFFg8usmSLElHcTZskl/5EO2SbkDa0Dwp1JM/PpMdFhLjds51No8iJnXPrznsB61WW803A6bbiHYiok5SG+3T6ETGRt9jEp0bYF8O19mY+KbJU6dkg036SWmjMF2RweprA7/pjX1lcpH5Iutb759O1Sra2Z12/4fov75Hr0dvmX5c0L+1+YzgJymTm0FMXm0X14MMDYq2fnIvOtXR3r5RWyfcO3ka6KRgp2VRdcDCHL2Zvk1zOX3jDz5T357GGr0TD7HF6LAUQjxOvjw4wewZEhGVdX49edkh9iKJzzqcre4qkg/jGFUIG/tZy76Fs96rulhOi7XXn0JVTnSvHMljVDntna4YlSdd4YrTbdd7xf93v3QGuMA1sYfyncViPEz1V3VpOAZefje8RzuiDSQuHX/5I542PHrCQhvhDiQf+z9hzSxDa4uHioSVuVLy8KOKG/p5TnlfPZZFVT8mp7n8phXMvr+aPjASfM7BX/D4S4g0WrsJGHfOPqvWt+vVqv49wQhk715CJuuyqGfLW/+9Ab+QT6PpP0dh2b/v4j7IYI19oRaqA45+izDzuiLHfwBZOdzCFQcAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "797"
+      "799"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:47 GMT"
+      "Fri, 28 Mar 2025 05:08:15 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "816"
+      "611"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_1.json b/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_1.json
index c8847a62bc..9a881155a0 100644
--- a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-67_backup_snapshots_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1Su3LCMBD8F9U2MsIPxl0yadKkCFTJpDhLZ6PBthQ9mDgM/55jwGRoUqaTdle3e7M6Mmns9IqdNqNn9ftHwhR66bQNhLCaBfQh9SNYvzOBJQy/rHboHwJxIhNFmq1SUW2XZZ0XdZG/kaR1+BlxlNN2skgyMyocYFREaUX3ssJctLkA1UBZLFewlqUopSS+1+P+HOPIdg5b0u5CsL7mXPYmqlThYTGYsTOqWUgzcLCaQ+jB84PgnTPRel5gq6AEhFUrUAmslColZgWNiD6g8/MhXVc5b0Duo+Xzgp7/Ec5hT4k89i07Jf+V8OZ753PncVWzE5VnTa/l9BxwuLbp0BICGwwvMJzbuJ89L36r6mmuygcIkYYw6jLiBTEOOtzob3yc6F+wOktYuDz8tWGnH15Ptu5UAgAA",
+  "Body": "H4sIAAAAAAAAAL1Su3LCMBD8F9U2UoQf4C6ZNGlSBKpkUgjpbDTYkqIHE4fh33MMmAxNSjrpdrW7N6sDkdaNb9BpawJpPj4zoiBIr13ECWlIhBDzYIQLWxtJRuDbaQ/hMSLGGS9zNs/5cs3K5qFqWPGOlNbDVwIjx/XoAGnWKBiEUQhphfeqhmrOlkXNKt7KYgFiXsCyXCDea7M7xTiQrYcWudsYXWgolb1NKlewnw3WdFZtZtIOVDhNRexFoHtOO2+TC7SEVolKoGjLQXGolaoksBIlUojgw3TIq5puhNwlR6f9Av0nm4ceAwXoW3LM7hTwantjc2NxIZMjVudsr+X4EmG4dOnB4USsIL6K4dTFjfS09rWn56mnEEVMqEGwyATnifWig5X+gacRPwVpWEbi+eGfCzn+AqeySkRRAgAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-67/backup/snapshots",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:54 GMT"
+      "Fri, 28 Mar 2025 05:16:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "164"
+      "128"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/memory.json b/test/e2e/.snapshots/TestSnapshots/memory.json
index c7ea850eb6..ab4f140f0b 100644
--- a/test/e2e/.snapshots/TestSnapshots/memory.json
+++ b/test/e2e/.snapshots/TestSnapshots/memory.json
@@ -1 +1 @@
-{"clusterName":"cluster-91"}
\ No newline at end of file
+{"clusterName":"cluster-67"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
rename to test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
index 4b38e3db42..7e03416597 100644
--- a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
+++ b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:05 GMT"
+      "Fri, 28 Mar 2025 05:07:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "144"
+      "124"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
rename to test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
index a501abd70a..ca2ae7ec4f 100644
--- a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
+++ b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections/connection-377",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28/connections/connection-443",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:05 GMT"
+      "Fri, 28 Mar 2025 05:07:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "198"
+      "129"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_67e62e9158616125063f111a_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
rename to test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_67e62e9158616125063f111a_1.json
index 0918f6771a..983802bd89 100644
--- a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
+++ b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_67e62e9158616125063f111a_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/privateLinkConnections/67e42d68adba6513a8c5fdac",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/privateLinkConnections/67e62e9158616125063f111a",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:02 GMT"
+      "Fri, 28 Mar 2025 05:07:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "42"
+      "27"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_1.json
index 84ee8c1e8c..a224653ee5 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAABWOPQ+CMBBA/8sNTkoBBU0T4uBu2I3DQY+P2FLSu7IQ/rswvre8t4Idpx+D/qwwBOpAwyAys1aqtT6ai6ElcX7qvWmS1juF86hQLLJactUHH2dW5Z1uuSkzNA2WRXbFR1t0jXkolkDo+DljT+/oquw0CjmuKdS7qbI0hTMEsnuVyXawfQ/kaOU42kG8oH35OAnodPsD5EQaj60AAAA=",
+  "Body": "H4sIAAAAAAAAABWOsQ6CMBQA/+UNTkpbCBWbEAd3w24cKjyQ2FLS98pC+HdhvFvuVnDj9CMwrxW+EXsw8GWeyQjRupC6S4dL5sM0hO6TtcELO4/CsrMkllwMMaSZhL6izrFqy0orrfJS6qJXsrgJ4ojW0322Az6Tr9VpZPTUYGx2Uysp4QwR3V4ldD1s7wMpOT6OduDA1j1CmhiM3P7wo0G+rQAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "167"
+      "166"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:07:27 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "46"
+      "48"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_2.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_2.json
similarity index 57%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_2.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_2.json
index 40f92b7a17..e9ee1dd0b5 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_2.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQTUvDQBCG/8scPJls028DRUoPkksJLepBpEyzk3Rpsht3J0Up+e9uEgVFPM4M78czVyiVPjuIX65wspRDDCfm2sVCZKVpZCDpElZGF0Yew8xUAmslkEt04jIWhTVN7cR8QdOxnEcojzifRRNcZrP8KJfCsSWs3H2NBW2bahXdKKbKpWRTv1lFoxHcgqXSpzoqc2hfu9E1JQ+NDkr605f99Jd9lk+8ViJjak1Gzu2oUEZDfIW+uN9elCTr9evnfR8z3OEp2T0k22R9eNyvob2FHiL5EfSHw6tPxrHGirpe0PMHA1zwX7vg/G45Dy/KFkorDBqHIYZvDdmP74f2z9XE4LE7c19BaceoMwruFmMfO2RsjM5V0aGx6on26WQEbfctNozlxjSaIY7aT+HrDYjOAQAA",
+  "Body": "H4sIAAAAAAAAAHWQQWuDQBCF/8sceoruqolRIZSQQ/ESJKHtoZSwdUezVHft7iotwf/eVSk9lB5nhjfvfe8GjZDvBrKXG1w1VpDB1drOZISUjeq5x3HwWyVrxd/8UrWEdYIw2zBDhpDUWvWdIfEW4xCTcpPEQRyEGxpHVUCjlBirkbXmvmM1Hvt2F9wJi60pUBduswsohRVobJyrwaaC8XUaTd/YJdFFcHda3qd0S+OwKtcJsmjNozR1Ws4sK7Qq0ZgT1kJJyG4wB3fbQXDUTr9/Ps82yx2e8tNDfsz3l8fzHsYVzBD5r9FfDqe+KmMla3HKBTO/t8B5/6XzPlNed/4gdC2kYF5vmM/8jx7110+hc7kSLTjs6bmLIKSxTJbohYlzXSwOSlainsismIHORURhnMqyyrLmoHppIQvGb7faGIHNAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "318"
+      "327"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:58 GMT"
+      "Fri, 28 Mar 2025 05:07:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "65"
+      "47"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
index fa28675664..77b852b50e 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWPwU7DMBBE/2XPsUWbNi25RT1UuaCqEXBAVbXxblyLxgbbiUBV/h23cIAD19mZfTMXOBqCEooVL+ZULJBaLJazHNdq2akuhwwII+68UxzCnrVxFsoLqLMbKKmjIfYpXz03yep/7vBU77f1Q10dH5sKpgy0d8Nb/Qs0+wNqaZ3SJxeixZ4DlC+A8YxBhOgZe/FfO/H64WMnR+O1sQbFEFCifB/Yf8reWe2oFcSjtBzhkMH1eapgbIhoFYv71TxhvxkbZzujr9OiuS1qdvkdTNMXgTwwwSEBAAA=",
+  "Body": "H4sIAAAAAAAAAHWPwW6DMBBE/2XP2DKQOMAN5VBxiaKgtoeqirZ4cS0FO7ENahXx74W2Uk+97uzMm7nD2SioQO5IZlSKnZBZ320Kwnyj8rKEBBRGPHrXUQgn0sZZqO7QXdyolutkFPnFXz+3y6v/1eGpOT00h6Y+P7Y1zAlo78Zr8wcqum0hU5lmWyHzPhX5Cnp3IVocKED1AhgvGFiInnBg/7VjH6XSVz4Zr401yMaAHPltJP/JB2e1U29M0cQtRXhNYA1fKhgbItqOWFYs1B/E3tne6HVZNN+D2mMuYJ6/AB/3KywgAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "227"
+      "234"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:59 GMT"
+      "Fri, 28 Mar 2025 05:07:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "64"
+      "36"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_auditLogs_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_auditLogs_1.json
similarity index 71%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_auditLogs_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_auditLogs_1.json
index a6ab5f3272..6ec391ac3f 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_auditLogs_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_auditLogs_1.json
@@ -2,16 +2,16 @@
   "Body": "H4sIAAAAAAAA/wEAAP//AAAAAAAAAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/auditLogs",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28/auditLogs",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"instance-972_2025-03-26T16:37:46Z_2025-03-26T16:37:56Z_audit.log.gz\""
+      "attachment; filename=\"instance-28_2025-03-28T05:07:18Z_2025-03-28T05:07:28Z_audit.log.gz\""
     ],
     "Content-Type": [
       "application/gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:57 GMT"
+      "Fri, 28 Mar 2025 05:07:28 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "812"
+      "562"
     ],
     "X-Java-Method": [
       "ApiStreamsResource::getAuditLogsForTenant"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_1.json
index 2ff59aa1a8..2513432869 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWQ20oDMRCG3yUXXrWbbrUHF0S0eCEeKB5AEC+m2dk2NMksmUlVSt/dRAXxLplkvv+b2Stnw5ZV87pXm4idatRGpOdGa+MotcMWd5WnsKZ2VRnyGnqrQRyw3o31OlLqWU9neDJupzW0K5hO6mOYm0m3aueaJSJ41jawQDA4PJ2NtaEQ0IilwOc9rPE++bP6yAp6XmJc5spZPRqpgYrosg6j69ThrVw5OflRhSQbDGINFI5q9sqj2UCw7HPL4+Lh4m44nkwzJDHGAB5zGVpvgzoM1IpIshr0jxh3GDNS4Qf43mEZsZmP5qNBFyG11f/yt1XW7+y6RGYJqqjrGKXKciiFA9FZZCkxv7F/8w6PZ7NMCCjvFLc2/FCMQeZyks++/F8+X95eL9QhExhNilY+y2sfSchQWcny9uL6/unq5amk/HbdQLeF7z0JCbgFpZB96sMXlLMSYuEBAAA=",
+  "Body": "H4sIAAAAAAAAAFWQTWsbMRCG/4sOPdmr3XW83S6EkpoeQj4wTQqF0sNEO2sLS5pFM3ISjP97pSRQepNGmud9Zk7K2XBgNfw+qX3ESQ1qLzLzoLVxlMbliMfKU9jR+FQZ8hpmq0EcsD62ehcpzay7z9i12Jt13zVd067rbjU19eqLZokInrUNLBAMLtteGwoBjVgK/HWGHd4nf9l8soKetxi3uXLZ1LVaqIgu2zC6SZ3/lCsnJ++mkGSPQayBwlHDSXk0ewiWfW552Py4ulu26y5DEmMM4DGXYfQ2qPNCPRFJNoP5AeMRY0YqfAE/OywTDn3d14spQhqr/8tvVll/srsSmSWoomlilCrLoRQORGeRpcR8xP6bd3lxscqEgPJM8WDDO8UYZC4neZ3L/+3Pb7fXG3XOBEaTopXX8jpHEjJUVrK9vbq+f/z+67GkfHTdwHSAtz0JCbgNpZB9mvNfFT4krOABAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28/connections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "356"
+      "359"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:03 GMT"
+      "Fri, 28 Mar 2025 05:07:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "122"
+      "94"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
index e07ec7b125..ddbeec4ccb 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAFWOQWsCQQyF/0vO67K0WGVvVjxIbZFqodd0zOjgTrJksrYi+987Q730EkLey/feDXCwE7EFhxaEob1BJHdCDilCC7vl++J18jB9ggqGRMoYKZ/xEAPDWMGXiCVT7HekF9KUNfrB2HdUO4ntvJk3lVccDvX/c9NkoBP24VgicwmpxftEVivlWTioXaBkJeYemx+YXOk5eZzNMoHJvkXPgf8ozlFKZbNrX/zbj+fNegljJiRygwa7FrVXMXHSFcdmsX7brz73JeX+9YL+jDD+ApCgW0gbAQAA",
+  "Body": "H4sIAAAAAAAAAFWOQWsCQQyF/0vO67K0tsjerHiQ2iJqodd0zNTBncmSZLUi+987Q730EkLey/feDXCwIyULDi1wgvYGkdwRU9AILewW2/nb5OHpGSoYlCRhpHzGQwwJxgq+mE1NsN+RnEk0a/SDse+odhzbWTNrKi84HOr/56bJQMfJh+8SmUtwzd4rWS2UZ+GgdIHUSsw9Nj8kcqXnZDp9zIREdmE5hfRHcY5Uy2bXvvg3Hy/r1QLGTFBygwS7FrUXNnbcFcd6vnrfLz/3JeX+9Yr+hDD+As2YVNMbAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections/connection-377",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28/connections/connection-443",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:03 GMT"
+      "Fri, 28 Mar 2025 05:07:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "60"
+      "35"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_1.json
index 2f0a9725b5..83bb943c59 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWQT0/jMBDFv4sPe9rETdM/oRJCVYnYSixCQC8gVDn2JFibeCzPOBwQ332d0kXa4zzP8/ze+xC9dX9IbF4+xFuAVmzEG7OnjZS6x2gyA2M+oOvQNLnGQSpvpeJekRznsgsYPcnVGhZzsyqUadRqWZSq0su2MZUkDqAGkj7YUTHcplM7dA40W3R05VUHd3G4LH5YhoHuIdwn5bKYzcRPEaBPMAR9Kz5fp5Fiz1+gR2vS0/lq9d9Vo3TyGkfXOCjr0hoDcebUAOSVhpwgjFZDEyl/t87gO+UOOHl8wNEaCMmyfT481CeELnEm4fB4rLePT8d5Es8f1M54tI73E4qk2JAO1p9yydbMUhdtmzXlGrLF6qLMqsXFOqtK0G1RlapYLGUKhDFouPnq8IQZOvkPg+RvqwMStpzXIzj+FRv5HeO8/z1PXJwaTiz769uJPVkMTmFu6rv6Yb87lcjIqt9hdCw2xedfYx/qwvwBAAA=",
+  "Body": "H4sIAAAAAAAAAFWQT0/jMBDFv4sPeyJx3LRpWgmtUInYSixC/LmAVpVjT4K1iW15xuGA+O44LSBxnOd5nt97b2ww9j+y7fMbewnQsS17IfK45VwNLupMw5SPzvZOt7lyI5fecEmDRD4teB9c9MirNVQLqNWqrkQlFquiKjtRlBuOFECOyH0wkyS4Tqd2zlpQZJzF3172cBPHc/HLEIx4C+E2KeeiKNgZCzAkGIShY+//5hHjQCfQg9Hp6XR1I35cFUImr7Z46UZpbFojQMqsHAG9VJAjhMkoaCPmr8Zq94q5BUoeH9xkNIRkuXh6vGuOCH3iTMLj/aG5uH84LJL4+UFjtXfG0n5G4RhbVMH4Yy7e6UJI3XVZW64hW1abMquXm3VWl6A6UZdSLFc8BXIxKLg6dXjEDD3/wkD+16jg0HWUNxNY+hNb/h3jc/97nrkoNZxY9pfXM3uyaDeHuWpumrv97lgiOZLDzkVLbCvePwARHweZ/AEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/privateLinkConnections",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/privateLinkConnections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "374"
+      "376"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:01 GMT"
+      "Fri, 28 Mar 2025 05:07:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "52"
+      "39"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_67e62e9158616125063f111a_1.json
similarity index 60%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_67e62e9158616125063f111a_1.json
index 5f75e96657..1a3f93a07d 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_67e62e9158616125063f111a_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2PP2/CMBTEv4tnEjfkL2yoWDQS7QBl6RLZfs/IA3bk54Sh6nevU1HGO92dfvfNBgtsy5oWqzU0nQQlm7ooZadrA1KzFQNHe3+T1qVYRIqZkzekUWrMCcNsNaqJ8rt14O+UO4ypMwY/W8CQKruvy0kkK+DV+mXjch7E7vw5rJP5GBAORm9d7BcUTpMiHewYU564gZdCgjGZKlvMqmZTZl21abOuRG2KrpRFVfOA5Keg8RD8NBL/wwxX/o9B/N3q4MmbmIsZXXybFH/eeOSfeuGKMmJi6ffHhT1VwC9nDuJDnPpX9vMLPTIvhDgBAAA=",
+  "Body": "H4sIAAAAAAAAAD2PPW/DIBiE/wtzbII/sN0talBiqe2QNEsXC8NLxBCweLEzVP3vxVWa8U53p+e+yWA1eSG8AV5Ax+qWM86KestLwxiTZEO0w72/SetSLALGzMkb4CQV5AhhsQrGGfO7ddrfMXcQU2cKfrEaQqrsvi4nkawAV+vXjct5ELvz51Ak8zEgnJ68dbFfUSjOI6pgp5jySI3eMqmNycaygaziXZm1VddkbQnKsLaUrKppAPRzUHAIfp6Q/mGGK/3HQPpuVfDoTczFAi4e55E+bzzyT71yRRkhsfT7t5U9VbRfzxzEhzj1r+TnFyOWuqE4AQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/privateLinkConnections/67e42d68adba6513a8c5fdac",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/privateLinkConnections/67e62e9158616125063f111a",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "248"
+      "249"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:01 GMT"
+      "Fri, 28 Mar 2025 05:07:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "50"
+      "23"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json b/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
similarity index 60%
rename from test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
rename to test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
index f1ef0408f8..356def068a 100644
--- a/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
+++ b/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJfaWQiOiI2N2U0MmQ2NGFkYmE2NTEzYThjNWZjZjMiLCJkYXRhUHJvY2Vzc1JlZ2lvbiI6eyJjbG91ZFByb3ZpZGVyIjoiQVdTIiwicmVnaW9uIjoiVklSR0lOSUFfVVNBIn0sImdyb3VwSWQiOiI2N2U0MmQ2MWFkYmE2NTEzYThjNWZiZDgiLCJob3N0bmFtZXMiOlsiYXRsYXMtc3RyZWFtLTY3ZTQyZDY0YWRiYTY1MTNhOGM1ZmNmMy1reHJ0Zi52aXJnaW5pYS11c2EuYS5xdWVyeS5tb25nb2RiLWRldi5uZXQiXSwibmFtZSI6Imluc3RhbmNlLTk3MiIsInN0cmVhbUNvbmZpZyI6eyJ0aWVyIjoiU1AzMCJ9fQ==",
+  "Body": "eyJfaWQiOiI2N2U2MmU5MDcwNjJmYzQ4ZWEzNGQzOTkiLCJkYXRhUHJvY2Vzc1JlZ2lvbiI6eyJjbG91ZFByb3ZpZGVyIjoiQVdTIiwicmVnaW9uIjoiVklSR0lOSUFfVVNBIn0sImdyb3VwSWQiOiI2N2U2MmU4YzU4NjE2MTI1MDYzZjEwMzkiLCJob3N0bmFtZXMiOlsiYXRsYXMtc3RyZWFtLTY3ZTYyZTkwNzA2MmZjNDhlYTM0ZDM5OS14OWRncC52aXJnaW5pYS11c2EuYS5xdWVyeS5tb25nb2RiLWRldi5uZXQiXSwibmFtZSI6Imluc3RhbmNlLTI4Iiwic3RyZWFtQ29uZmlnIjp7InRpZXIiOiJTUDMwIn19",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28",
   "Headers": {
     "Content-Length": [
-      "289"
+      "288"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:59 GMT"
+      "Fri, 28 Mar 2025 05:07:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "137"
+      "79"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json b/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
similarity index 91%
rename from test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
rename to test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
index 46e59062a7..56aabd18f3 100644
--- a/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
+++ b/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_connection-443_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRoZW50aWNhdGlvbiI6eyJtZWNoYW5pc20iOiJTQ1JBTS01MTIiLCJ1c2VybmFtZSI6ImFkbWluIn0sImJvb3RzdHJhcFNlcnZlcnMiOiJleGFtcGxlMi5jb206ODA4MCxmcmF1ZC5leGFtcGxlLmNvbTo4MDAwIiwiY29uZmlnIjp7ImF1dG8ub2Zmc2V0LnJlc2V0IjoiZWFybGllc3QifSwibmFtZSI6ImNvbm5lY3Rpb24tMzc3IiwibmV0d29ya2luZyI6eyJhY2Nlc3MiOnsidHlwZSI6IlBVQkxJQyJ9fSwic2VjdXJpdHkiOnsiYnJva2VyUHVibGljQ2VydGlmaWNhdGUiOiItLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS1cbk1JSURnVENDQW1tZ0F3SUJBZ0lVQXlydTdHeW91RWFySTNQR0tiOWpDaHc0ZkZFd0RRWUpLb1pJaHZjTkFRRUxcbkJRQXdVREVMTUFrR0ExVUVCaE1DUVZVeEREQUtCZ05WQkFnTUEwNVRWekVQTUEwR0ExVUVCd3dHVTNsa2JtVjVcbk1SQXdEZ1lEVlFRS0RBZE5iMjVuYjBSQ01SQXdEZ1lEVlFRTERBZFRkSEpsWVcxek1CNFhEVEl6TURnd09UQTJcbk16azBPRm9YRFRJME1EZ3dPREEyTXprME9Gb3dVREVMTUFrR0ExVUVCaE1DUVZVeEREQUtCZ05WQkFnTUEwNVRcblZ6RVBNQTBHQTFVRUJ3d0dVM2xrYm1WNU1SQXdEZ1lEVlFRS0RBZE5iMjVuYjBSQ01SQXdEZ1lEVlFRTERBZFRcbmRISmxZVzF6TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF4bHpTYSs3bW05UjRcbnF0WU1sRjFpMlJqSktVV2MxTkVXZzhnRktRNUxORkg0cUU2V0NqUjdoVkwvYmZZKzIvWE5EV1dxeWQ1djFBZ3NcblFIVkc3ckgrSDVrT0ZEZHpkK1NUUlVOL0NpTlV1c1hNbGNiajVCRnJjZk9QL1QrWVV0dXlKNW1WbUJtK240ZFRcbnJlQVpmVzlsRTVVcFJiM295NGlna3RFT2RjWnRoTzE2dnV1VHRKbHFNOWhQUjduaUhqbGRlUzUrQzhBajNiMGZcbkg1L2l5OTU5TXRQcTd0aStmS0RmN1luVDdNSnltbVZlNnEzeFI4OTFDemZWNDhEbEVQTlREZDVlVEpVako0Qi9cbnEwMzl0NklwT1M5UXI1OU9nS3FlQmpLSUJYZTViMjJCczFzUlNHN1JrSFF1M1FUSkVPN25yRFA3S0s0VE9EdkFcblFmUHZkdEdjVlFJREFRQUJvMU13VVRBZEJnTlZIUTRFRmdRVXpxTDk3NEJtbEdPd3NKaTVLN2hEOGpQVHA2SXdcbkh3WURWUjBqQkJnd0ZvQVV6cUw5NzRCbWxHT3dzSmk1SzdoRDhqUFRwNkl3RHdZRFZSMFRBUUgvQkFVd0F3RUJcbi96QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUF1L3lYVVZWbk9IK2djWmZ4dllRdUR5T2dIQ2M0ZHNvM1gzVXBcbjZQSDdGRC9YZVFoZ0hKWVU0dHFvNm1FdEdQM1IyOEZyaWxRNnZDQmYyS21rSVdPQU84SDlPZmpkMHBSWXZySFVcbmswV1JnWFNhcnc0dkg4bzRuc0xLVkcxeVNJSlRRZHRNVHQvMzFRK0o0bk1Nei9sbTdOSWRtSEVzOTRTTm5YcDVcbkxLaEFHVUE5anVXYitGa2krMmlNamVHYUxkVENCSXpaUHdMU3QzVEhDWTZkVys2cVlUN3B4Y3NGelJqbW4reGlcblViYWYvb0dPdzYvM3dPSkZDaDc5TlhvT3ZjN0xQWjNySWZ4R1krZ2w5QkVtUEU5aDFNVzc3N3hlTlppQStjcUZcblFSQUMvYWM3TVJ6TW93WFJydVgzR2FoWmRNVnd3WDlyR3d2RlRmOURMQ0JMZ2FjTTFRPT1cbi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0iLCJwcm90b2NvbCI6IlNTTCJ9LCJ0eXBlIjoiS2Fma2EifQ==",
+  "Body": "eyJhdXRoZW50aWNhdGlvbiI6eyJtZWNoYW5pc20iOiJTQ1JBTS01MTIiLCJ1c2VybmFtZSI6ImFkbWluIn0sImJvb3RzdHJhcFNlcnZlcnMiOiJleGFtcGxlMi5jb206ODA4MCxmcmF1ZC5leGFtcGxlLmNvbTo4MDAwIiwiY29uZmlnIjp7ImF1dG8ub2Zmc2V0LnJlc2V0IjoiZWFybGllc3QifSwibmFtZSI6ImNvbm5lY3Rpb24tNDQzIiwibmV0d29ya2luZyI6eyJhY2Nlc3MiOnsidHlwZSI6IlBVQkxJQyJ9fSwic2VjdXJpdHkiOnsiYnJva2VyUHVibGljQ2VydGlmaWNhdGUiOiItLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS1cbk1JSURnVENDQW1tZ0F3SUJBZ0lVQXlydTdHeW91RWFySTNQR0tiOWpDaHc0ZkZFd0RRWUpLb1pJaHZjTkFRRUxcbkJRQXdVREVMTUFrR0ExVUVCaE1DUVZVeEREQUtCZ05WQkFnTUEwNVRWekVQTUEwR0ExVUVCd3dHVTNsa2JtVjVcbk1SQXdEZ1lEVlFRS0RBZE5iMjVuYjBSQ01SQXdEZ1lEVlFRTERBZFRkSEpsWVcxek1CNFhEVEl6TURnd09UQTJcbk16azBPRm9YRFRJME1EZ3dPREEyTXprME9Gb3dVREVMTUFrR0ExVUVCaE1DUVZVeEREQUtCZ05WQkFnTUEwNVRcblZ6RVBNQTBHQTFVRUJ3d0dVM2xrYm1WNU1SQXdEZ1lEVlFRS0RBZE5iMjVuYjBSQ01SQXdEZ1lEVlFRTERBZFRcbmRISmxZVzF6TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF4bHpTYSs3bW05UjRcbnF0WU1sRjFpMlJqSktVV2MxTkVXZzhnRktRNUxORkg0cUU2V0NqUjdoVkwvYmZZKzIvWE5EV1dxeWQ1djFBZ3NcblFIVkc3ckgrSDVrT0ZEZHpkK1NUUlVOL0NpTlV1c1hNbGNiajVCRnJjZk9QL1QrWVV0dXlKNW1WbUJtK240ZFRcbnJlQVpmVzlsRTVVcFJiM295NGlna3RFT2RjWnRoTzE2dnV1VHRKbHFNOWhQUjduaUhqbGRlUzUrQzhBajNiMGZcbkg1L2l5OTU5TXRQcTd0aStmS0RmN1luVDdNSnltbVZlNnEzeFI4OTFDemZWNDhEbEVQTlREZDVlVEpVako0Qi9cbnEwMzl0NklwT1M5UXI1OU9nS3FlQmpLSUJYZTViMjJCczFzUlNHN1JrSFF1M1FUSkVPN25yRFA3S0s0VE9EdkFcblFmUHZkdEdjVlFJREFRQUJvMU13VVRBZEJnTlZIUTRFRmdRVXpxTDk3NEJtbEdPd3NKaTVLN2hEOGpQVHA2SXdcbkh3WURWUjBqQkJnd0ZvQVV6cUw5NzRCbWxHT3dzSmk1SzdoRDhqUFRwNkl3RHdZRFZSMFRBUUgvQkFVd0F3RUJcbi96QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUF1L3lYVVZWbk9IK2djWmZ4dllRdUR5T2dIQ2M0ZHNvM1gzVXBcbjZQSDdGRC9YZVFoZ0hKWVU0dHFvNm1FdEdQM1IyOEZyaWxRNnZDQmYyS21rSVdPQU84SDlPZmpkMHBSWXZySFVcbmswV1JnWFNhcnc0dkg4bzRuc0xLVkcxeVNJSlRRZHRNVHQvMzFRK0o0bk1Nei9sbTdOSWRtSEVzOTRTTm5YcDVcbkxLaEFHVUE5anVXYitGa2krMmlNamVHYUxkVENCSXpaUHdMU3QzVEhDWTZkVys2cVlUN3B4Y3NGelJqbW4reGlcblViYWYvb0dPdzYvM3dPSkZDaDc5TlhvT3ZjN0xQWjNySWZ4R1krZ2w5QkVtUEU5aDFNVzc3N3hlTlppQStjcUZcblFSQUMvYWM3TVJ6TW93WFJydVgzR2FoWmRNVnd3WDlyR3d2RlRmOURMQ0JMZ2FjTTFRPT1cbi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0iLCJwcm90b2NvbCI6IlNTTCJ9LCJ0eXBlIjoiS2Fma2EifQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections/connection-377",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28/connections/connection-443",
   "Headers": {
     "Content-Length": [
       "1603"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:04 GMT"
+      "Fri, 28 Mar 2025 05:07:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "181"
+      "131"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_1.json
index 6b33763e92..7e79e32c7f 100644
--- a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsW6EMAyG3yUzXCAcAbF26tx2adXBxIZDDQTF4TqcePdyPfValoqF2Z/+/5Ms+yKMnTiQf3DTEESVRMJ4gkAoKqESlcdJFiv9nOoqK6o8fxWR6K4zXdBRoU4Ba9B5mkFp8qbGcpnbbvhgUb1dxMlTs7CnEEaupDTWTRgjnQ+9G1qH9cG4XsLYSQgWWJ6VbL2bRpb/pHuySySTbcQc7VAhjRsCdAN5vret0lfJf+CdbG7r2eTyg+5jghCgBqYX3qaz5vdxGmmby43bycE7Q8y0yePO7uPyeeoC2Y7DBpdfdn6PxAA9Lfh301NYXkDPMSmKVVosWc63j9erz6lB0KWCrFGEigpEbZCOYv4CHVSKxkkEAAA=",
+  "Body": "H4sIAAAAAAAAALWUu07EMBBF/8V1snYc4gS3VNRAA6Lw2pOHcOLI4yzFKv+OlxULaVAa13N075FGM2ei7YIB/INbpkAky4j2oAIYIglnvMpZmfPmmVWS1ZLXryQjw2UmahAcGl01ohAFr5go24KV93Fuh+kDiXw7k95DG9k+hBklpdq6xeQGTofRTZ0zx4N2I1XzQFWwCumJ0867ZUb6T7oHGyMRbEvWLEEF1W4KapjA461tk75J/gMnsrmuZ5fLD5rGxKigjgrhBffpbPk0TjPsc7lyiRy804AIuzxubBqXz34IYAcMO1x+2fU9I5MaIeLfTU8hvoARc+CQN3URs5zvHi9XX0FrlGi4KlsOhkNtjNAG7sj6BaPdpAJJBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "287"
+      "288"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:53 GMT"
+      "Fri, 28 Mar 2025 05:07:24 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1900"
+      "3033"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_1.json b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_1.json
rename to test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_1.json
index 87f925ad95..a9da0d1e09 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_1.json
+++ b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWPT0vDQBDFv8ucs4tNm6TkFnqQXKQ0qAeRMs1O1sFmt+6fgJZ8d7etiBdvw8x783vvDHtWUENZ0SofFiWqA5bFYonrvsxX1RoyUBhw62xP3u9IszVQn6E/2qjSdmJFLvmb5y5J3c8dntrdffvQNvvHroE5A+1sPLW/IFXQH1AxpCm536wPBkfyUL8AhiN64YMjHMV/6UR8/4onObHTbBhF9ChRfkRyn3K0Rlt1EIomaSjAawaX5ykCGx/Q9CTyokrYG2NjzcD6Ui3wtVG3Xd7BPH8DYCBy3CEBAAA=",
+  "Body": "H4sIAAAAAAAAAHWPwW6DMBBE/2XP2DKQOMAN5VBxiaKgtoeqirZ4cS0FO7ENahXx74W2Uk+97uzMm7nD2SioQO5IZlSKnZBZ320Kwnyj8rKEBBRGPHrXUQgn0sZZqO7QXdyolutkFPnFXz+3y6v/1eGpOT00h6Y+P7Y1zAlo78Zr8wcqum0hU5lmWyHzPhX5Cnp3IVocKED1AhgvGFiInnBg/7VjH6XSVz4Zr401yMaAHPltJP/JB2e1U29M0cQtRXhNYA1fKhgbItqOWFYs1B/E3tne6HVZNN+D2mMuYJ6/AB/3KywgAQAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/streams",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "230"
+      "234"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:09 GMT"
+      "Fri, 28 Mar 2025 05:07:28 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "142"
+      "143"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_1.json
similarity index 63%
rename from test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
rename to test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_1.json
index 280516be0d..bcdd98b522 100644
--- a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
+++ b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_instance-28_connections_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAFWOQWsCQQyF/0vO67K0WGVvVjxIbZFqodd0zOjgTrJksrYi+987Q730EkLey/feDXCwE7EFhxaEob1BJHdCDilCC7vl++J18jB9ggqGRMoYKZ/xEAPDWMGXiCVT7HekF9KUNfrB2HdUO4ntvJk3lVccDvX/c9NkoBP24VgicwmpxftEVivlWTioXaBkJeYemx+YXOk5eZzNMoHJvkXPgf8ozlFKZbNrX/zbj+fNegljJiRygwa7FrVXMXHSFcdmsX7brz73JeX+9YL+jDD+ApCgW0gbAQAA",
+  "Body": "H4sIAAAAAAAAAFWOQWsCQQyF/0vO67K0tsjerHiQ2iJqodd0zNTBncmSZLUi+987Q730EkLey/feDXCwIyULDi1wgvYGkdwRU9AILewW2/nb5OHpGSoYlCRhpHzGQwwJxgq+mE1NsN+RnEk0a/SDse+odhzbWTNrKi84HOr/56bJQMfJh+8SmUtwzd4rWS2UZ+GgdIHUSsw9Nj8kcqXnZDp9zIREdmE5hfRHcY5Uy2bXvvg3Hy/r1QLGTFBygwS7FrUXNnbcFcd6vnrfLz/3JeX+9Yr+hDD+As2YVNMbAQAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/instance-28/connections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:02 GMT"
+      "Fri, 28 Mar 2025 05:07:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "148"
+      "111"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
rename to test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_1.json
index 8b3096ceec..81b1790cc9 100644
--- a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
+++ b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e62e8c58616125063f1039_streams_privateLinkConnections_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2Pu04DMRBF/8U1XrPxPhy6SKyAgipQr/wYRy5iWzP2RgLx7zgopJyrc6/OfLM1OPbEphmGnZuUdkZPYy+1sqN32rIH5iI9p7MOsWEFqPCoz0BZW+gIcAsWTKXuEqJLF+oilNbJmLbgAFvl8FURWoRwCum68Xlcl8PxY9218DawRJdTiOXtqiKoGrIYcmk8Ce8ee+2850bOwIdpL7ka9jNXEqzvldT9MAoEShUtvGCqmcSfJp7EvwaJ92AxUfKlWzaI5bUacX/jxt9v9vMLoyu25BYBAAA=",
+  "Body": "H4sIAAAAAAAAAD2Py27DIBBF/4V1McEPbGcXqVaTRVdp1xaGIWIRsGbAkVr130uqNMu5OvfqzDebvWV7pnpQNYyyG5RUsu52qnFSSs1emA30Gq/ah4IloMSDvgKt2kBFgJs3sGSqbj7YeKMqQCqdFePmLWCpHL4yQokQLj7eNz7P83Q4f8x1CR8DU7Br9CGd7iqC8kIG/ZoKT8LZndTWOb40PfBWjQ0f2rHnQwPGyaHRsu0EAsWMBt4w5pXEnyZexL8GiXdvMFJ0qZo2COmYF/F848E/b/bzC6squZoWAQAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/privateLinkConnections",
+  "Path": "/api/atlas/v2/groups/67e62e8c58616125063f1039/streams/privateLinkConnections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "224"
+      "225"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:38:00 GMT"
+      "Fri, 28 Mar 2025 05:07:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "97"
+      "58"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/memory.json b/test/e2e/.snapshots/TestStreams/memory.json
index 5e8ce70946..4fcaae3544 100644
--- a/test/e2e/.snapshots/TestStreams/memory.json
+++ b/test/e2e/.snapshots/TestStreams/memory.json
@@ -1 +1 @@
-{"connectionName":"connection-377","instanceName":"instance-972"}
\ No newline at end of file
+{"connectionName":"connection-443","instanceName":"instance-28"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_instance-567_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_1.json
rename to test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_instance-567_1.json
index dd65813c95..e5cf334b04 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_instance-567_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/streams/instance-257",
+  "Path": "/api/atlas/v2/groups/67e62eb67062fc48ea34d6fc/streams/instance-567",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:11 GMT"
+      "Fri, 28 Mar 2025 05:17:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "135"
+      "125"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_1.json
deleted file mode 100644
index d191f1e086..0000000000
--- a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227iMBD9lZWfC4FwaZW3FGjFiptI2u52tUJOMgRvHTuyHVa04t93jNMLrLbal/YByXg8x8czc06eCM22VKSQDaRYs7xS1DApSPBE0kobWcxLEFrzASs3oNyZmOu2T4IfP89IwQQrqmIkaMIhw8BCSSNTyUlA4knUXvnkjBiu36ZPZQYYHo6uwptJTPZnJKHpQ1XWICRYU64BdxmeF5AaqSwdOAkroNlCwRoUIH0E1JBKkVG1s5ApR/ag4l1pQ8vRYjIehNEoRjqpQ8VXRkYxkWtEtxkIaGCIP0zwW36v0eo0/H7c7ged86DXvcfUjOmHiD3C9SUJOq1my+3cUYV1eH7X1c1k8n11Fy6noyGmIDm1K+1toVmCNligLcsAn0Rm89kIT+RcJpQPHOEI+HpKBc0hizZUZYj78uJcyaocYwVI/xy6ftbDCiS032t36EXaW+MK0dhrvO8fxdMexTinCXDtuseZeLDLJ7LBQmLexphSB56XcllljQy2zUKKXGZJM5WFR0vmUcOp9ra+dyCjvX8x8eoG6OdFw++2ie0aP7SKr7FLn3Wv5wbMU1h/qeCrTPQLlaOrj659e/rzuWpBS72R5n+Yvp7dW03ayPBySn9JdYvoBzmTi2aLvMSOtpt9DAha2OE9blZJK/1GcSUzpxpVUHKWHiwjKiF1w/TOCHbtCIqqOMw2nm5biByznTW4fBx/vjMs1TUkIgptrElZ7SH2tN2qxTieLyIrxRZKERJ9K3lVQC36KA5nw3BpRShQmgNZCUOCFkqdVkZGKeUHcaHRyaKsrOz/NplSQcbQK7Zw+nKN+TCUv8VxYO94WYM4RdtjDDg6j938iKd19pYwk4qZHQnO7R/nNTPX3PAuIs4354LvPqq4rp/1lTfRahRG8ap9mMxHKWD8jj/Zj4U9Uyff4/KLy1RSmgEoU98+jpbXy/k8/manFNmb55TBchTG49m1/erQvLY5HGj058OQ2s+T8/7Tfm6dJJbYIaoh2qEMCgScxBHZ/wEoVcAIJQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/clusters/cluster-241",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "781"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:55 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_2.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_2.json
deleted file mode 100644
index 841b4668a9..0000000000
--- a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW8aORD+Kyd/6JcL7Atv0UrRiQKtOEGI2E1zbXWKjHcAX7z2yvZSkYj/fuP10gTai06VWimRFs/M43l55vETofmOSgb5SMk131SaWq4kSZ4Iq4xVxaIEaYwY8XIL2vtkwkQxST7/fUEKLnlRFRNJVwJyNNxoZRVTgiQkm6XRfUwuiBXmZfhc5YDm8eTd8HaWkcMFWVH2UJUNCEnWVBjAU47+EphV2qUDZ2YNNL/RsAYNmD4CGmBK5lTvHSQTmD3obF8603JyM5uOhukkw3SYR8UqU6u53BiHbix1sQhPCiU3Kl8lQdCAtOJu1DJbtLbCEP/a1cNjVbYbv1YOu7YEm8SDMBpcfD8m+oGY+LWY4A8cypXVFbyhld2mqtIMrmiOA3mjoRSc0RTsFbWCmtYXZi675REaW3CsNtW754J/N3p3WvT3E6jbi923MMZ/jI/DuNcKO624n0X9pDNIet1PeEnOzUPKH+H9W5J0wnboT+6oxhyPJHh3O5t9vL8bLueTMYbgJPW+dKMZ2iUYi2za8Rxw/uR6cT1Bj41QKypGPscUxHpOJd1AnrraEPcrPTZaVeXUzbM/gG6c95AuK9rvRR16yXpr/EI0/mzvxyd21qNoF3QFwniqCy4f3OcT2SLrMG5rbWnqhqkqr5vTNKrNVBHQkgd194NdHNTJmOC/Mjn23LxsPnEUFzWvxRp7/qvuDfw2Bhr7rzT8qVbmayonV59c+9L71+dqJC3NVtn/k+mz78EJmLOM387pP0p/QPRa+8hl221JYzs5bvfRIGnhyHs6rJJW5oU8ldyeC1qzl7XylMA8mV6hYNdRUFZFzW30jhzEBqO9jvp4pL/YW85MA4mI0q03A7d7iD2PwmYZp4ub1K1iiKsIK/NBiaqARiHTbHg9Hi7dEkpczZGqpCVJiKuO8qJSRkW9XPgqqKKs3Np/q8ilhpyjsO7gvHKD8TBWX+Sp4eDzcgJxjnZAGwiUaXf4M0rrHFzCXGlu9yQZuB9ea679cId3KfGPzEKK/c9qrp9nc+Vtej8Zptl9VDPzUUmYvqJP7mV1Pk3wJ/z8zUdqpewItG1un6bL98vFIvsr8spvjyHT8cxJqqWbRuKQzKjNNUHdO+4fyfNZ7vw6LHE61EC6xxUoEGyWpeTwL2BKPztOCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/clusters/cluster-241",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "882"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:45:09 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "83"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_cluster-489_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_cluster-489_1.json
new file mode 100644
index 0000000000..2ea6da72d6
--- /dev/null
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_cluster-489_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW/aMBT9K5OfCwnQ8pG3FFjFxJeStN06TcgkF/Dq2JHtMNGK/75rnHbA1Gkv7QOS8b33+Nj3npNnQrMtFSlkfSlWbF0qapgUJHgmaamNzGcFCK15nxUbUC4n4brRJMH3HxckZ4LlZT4UdMkhw8BcSSNTyUlAknHcWDTJBTFcH5dPZAYYHgw/h7fjhOwvyJKmj2VRgZBgRbkG3GWYLyA1Ulk6cBZWQLO5ghUoQPoIqCGVIqNqZyFTjuxBJbvChqLhfDzqh/EwQTqpQ8VbxkYxsdaIbisQ0MAAf1jQ9JtXNb9Va3YT/yrwu4Hfe8DSjOnHmD3BzTUJWn7ddzv3VOE7vNzr8+14/G1xH0aT4QBLkJzaFfa00ESgDT7QlmWAVyLT2XSIGWsul5T3HeEY+GpCBV1DFm+oyhD39cZrJctihC9A2h1oN2HZ7vjt5iq97AJtXWbtVYpo7CjeO4l36BXGOV0C1657nIlHu3wmG3xIrNsYU+jA81Iuy6yWwbaeS7GW2bKeytyjBfOo4VR726Z3IKO9t5h4VQP0y6J22e0R2zV+aBVfYZc+6lzPDZin8P2lgi9yqV+pnBx9cuxx9sdz1YIWeiPN/zD9k7u3mrSRwfWE/pTqDtEPcibduk9eYyfb9TYGBM3t8J42q6ClPlJcwcy5RhUUnKUHy4gLSN0w/WMEu3ZERZkfZhuzGxZijdXOGlw9jj/fGZbqChIRhTbWpKz2EHvS8Csxjmbz2ErRRynCUt9JXuZQiT5OwukgjKwIBUqzL0thSOCj1GlpZJxSfhAXGp3Mi9LK/m+TKRRkDL1iC+c311gPA/lLnAb2jpc1iHO0PcaAo/PYzfe4WmtvCTOpmNmRoGP/OK+ZuuaG9zFxvjkTfPdej+v6WR15Gy+GYZwsGofJfJICRm8PR69DXE5V/IDLT65SSWn6oEx1+iiObqLZLPnawApkb15K+tEwTEbTG/vVoevK5nCg0Z8PQ2o/T877z/u5dZKIsENUQ7xDGeQIOE5isv8NNF//CiUHAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62eb67062fc48ea34d6fc/clusters/cluster-489",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "782"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:10 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "59"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_cluster-489_2.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_cluster-489_2.json
new file mode 100644
index 0000000000..ce3d8f71bd
--- /dev/null
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_cluster-489_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY8aNxD+K5U/5EsPdtm7A26lU0WARFRwnPBerk1VnYx3APe89tb20pIT/73j9ZIATaKqUiKBBJ6Zx/PyzOMXwvItUxzyoVYrsa4Mc0Irkr4QXlmni3kJylo5FOUGTPDJpO0kJP3t9wtSCCWKqhgrtpSQo+HeaKe5liQl2ZR2nhJyQZy0x+EznQOaR+M3g4dpRvYXZMn4c1U2ICRdMWkBTwX6K+BOG58OnJkNsPzewAoMYPoIaIFrlTOz85BcYvZgsl3pTYvx/XQyHNBxhunwgIpVUmeEWluPbh3zsQhPCq3WOl+mUdSAtK76Ny27QWsrjvHT/pMLqduNXyuHbVuBS5Ne3OldfD6m8z9ikq/FRD/hUG6dqeAVq9yG6spwuGU5DuSVgVIKzii4W+Yks60lh2f99wEaW3Colprtp4J/tGZ7WvTnE6jbi913MMIvxidxct2KL1tJP4uv07ifxjfv8ZJc2GcqPsDb1yS9jNtxOHlkBnM8kODNw3T669PjYDEbjzAEJ2l2pR/NwC3AOmTTVuSA8yd387sxeqylXjI5DDlSkKsZU2wNOfW1Ie5HeqyNrsqJn2e3B90Elt1e3E1W/KoP7PIq7644ookj+82Jvceu0S7ZEqQNVJdCPfufL2SDrMO4jXOlrRumq7xuTtOoNtdFxEoR1d2PtklUJ2OjL2Vy6Lk9bj7xFJc1r+UKe/697o3CNkYG+68N/KyX9mMqJ1efXHvs/f1ztYqVdqPdf8n0k+/eC5i3jF7P2B/avEP0WvtIv+23pLGdHLe7aFCs8OQ9HVbJKnskT6Vw54LW7GWtPCXwQKavULDvKaqqouY2enc8xBqjg46GeKS/3DnBbQOJiMqvNwe/e4g968TNMk7m99SvYoyrCEv7TsuqgEYhaTa4Gw0WfgkVruZQV8qRNMZVR3nRlDNZLxe+CrooK7/2/1bk0kAuUFi3cF65xXgY6b/UqWEf8vICcY62RxtIlGl/+C1Ku9z7hIU2wu1I2vN/gtbcheEOHikJj8xcyd23am6YZ3PlA30aD2j21KmZ+UErmHyZHDc9Enya4Pf484cQabR2QzCuuX1CF28X83n2SycovzuETEZTL6mOrRuJQzKjNtcE9e94eCTPZ7kN67DA6TALdIcrUCDYNKNk/w9UeSOPTggAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62eb67062fc48ea34d6fc/clusters/cluster-489",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "883"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:17:07 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "74"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..42dde55b67
--- /dev/null
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmVVdHoYwiHQ78wioOhkhsbzUsbUqS+rDhf1+siDqlzR5zc3LvSW6SH8Ro9iWR+/mDdgIS5KKdUrl0MY4YL+KnGPatlGdbHm9aEU8xySkmihGJ9228FbzIJXZ64LRh4/Qsp51E3RcgnW7sJJFOUUgFQuJc8D2NQWABW8oz+UozPRdDnxeZ8pQooHFGpOcvw4aiILyRbTVysoVxkXp2gypI5RTEVEc827JQEwlgWlgCS9BhdRzKgqnTZmgmFckiCOk3nCJkTygjGwazk0MZjCEheg1yjw5NlJEUdMZFuA78cL620aF5xSSEyXuoXQMtg/tMf6uVTGWivr/uB+P5zB9WWwWL9Xgymw9qqUdaj6FKrzPUqYFM5c9cZdHQN+iPPzWDwsliPqjv5A1ZudsbsltDls0y8ryQdZ4X0tzT6JQMqUq/UWB2FzRnUvPNhNL36j9Upf/70MxfP9j6J3bTgmdjsld5cB/XgqtL3LbK4fmjPSZdhmVIcUVY+Rcj1z78AuwA1oQUBgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e62eb67062fc48ea34d6fc/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "414"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:08 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "57"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index f605b69e00..5d0e918fd0 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:53 GMT"
+      "Fri, 28 Mar 2025 05:08:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_1.json
index dcea31a8fe..933dfa3334 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsW6DMBCG38UzxMQOJmLt1Lnt0qrDYR8E1WDkM+kQ8e51GjUtS8Xi7aT79P+fdLIvTNuZAvoHN4+B1UXGtEcIaFjNRCHKvJC5UM97VcuqLuUry1h/3akKD8KUCKYBVe4lHHXZxinubT9+EKvfLuzksY3sKYSJas61dbPJDZ53gxs7Z5qddgOHqecQLBA/C955N0/E/0n3aGMkoW3ZkiWo4NqNAfoRPd3bVumr5D9wIpvbeTa5/KBpTAwEaIDwhbbprPk0ThNuc7lxiRy800iEmzzubBqXz1Mf0PYUNrj8sst7xkYYMOLfTU8hfgED5Sgwl6qKWc53j9dXX2JrQB0FyFagEVgZo7TBA1u+ACFE0IlJBAAA",
+  "Body": "H4sIAAAAAAAAALWUwW6EIBCG34WzLgQVjdeeem57adMDwqikKIbB7WHju5ftptt6abyQzG2+/P+XTOBClF0xgH9w6xxIyzKiPMgAmrSEM17lrMh588yqljVxXklGzHUnahAcOlEzwXtVNiCLUotexb018weS9u1CRg99ZMcQFmwpVdatOtdwPk1uHpzuTspNVC6GymAl0jOng3frgvSfdA82RiLYnmxZggqq3BykmcHjvW2Xvkv+AyeyuZ3nkMsPmsZEyyA7ifCCx3T2fBqnBY653LhEDt4pQIRDHnc2jcvnaAJYg+GAyy+7vWdklhNE/LvpKcQvYMIcOOS8LmOW88Pj9dVX0GspGi6LnoPmUGstlIaSbF8HHndKSQQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "288"
+      "286"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:50 GMT"
+      "Fri, 28 Mar 2025 05:08:06 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2604"
+      "2330"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_1.json
deleted file mode 100644
index b47fbe8678..0000000000
--- a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPTRw7lxZ+cxO3yJAbYrfdOgyBYjOJVlkyJDlDWuTfR0XuJRlW7KV9CKCI5OERyUM/EZpvqcgg70uxYutKUcOkIOETySptZDEtQWjN+6zcgHI+Kdd+QMIfP89IwQQrqiIWdMkhR8NMSSMzyUlI0lHiLwJyRgzXb8PHMgc0D+Kr6GaUkv0ZWdLsoSprEBKuKNeAtwz9BWRGKksHTswKaD5TsAIFSB8BNWRS5FTtLGTGkT2odFda0zyejYb9KIlTpJM5VHxlYhQTa43oNgIBDQzwhwFBK+g2Wu1G0Ev9Xtg+D7udewzNmX5I2CNcX5Kw3Wq23M0dVViH53dd3YxG3xd30XwcDzAEyaldabNFZg7aYIG2LAd8EplMJzF6rLlcUt53hBPgqzEVdA15sqEqR9yXF6+VrMohVoD0zqET5F2swJL2un6bXmTdFZ4Qjb3ae8GRPetStHO6BK5d9zgTD/b4RDZYSIzbGFPq0PMyLqu8kcO2WUixlvmymcnCoyXzqOFUe9vAO5DR3r+YeHUD9POhEXR8YrvGD63iK+zSZ+X13IB5CusvFXyVS/1C5Sj1Udq33p/PVQta6o00/8P01XdvNWktg8sx/SXVLaIf5Ewumi3yYju6bvbQIGhhh/e4WSWt9BvFlcycalRByVl2WBlJCZkbpndGsGNHUFTFYbbR27cQa4x2q8HF4/jznWGZriERUWhjl5TVHmKP/VYtxuF0llgptlCKsNS3klcF1KJP0mgyiOZWhAKl2ZeVMCRsodRpZWSSUX4QFy46WZSVlf3fS6ZUkDPcFVs4fbnGeBjI3+LYsHe87II4RdujDThuHnv5EU9r7y1hJhUzOxKe2z9u10xcc6O7hLi9ORV891HFdf2sU94kizhK0oV/mMxHKWD4zn6yHwvrUwff4/GLi1RSmj4oU2cfJvPr+XSafrNTiuzNc0h/HkfpcHJtvzpgt/JhNO1HyW380y5unRDm2BeqIdnh8BcIM0oTsv8D82zk1xsHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "776"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 16:37:54 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "543"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_1.json
new file mode 100644
index 0000000000..5c3c1264ed
--- /dev/null
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW/aMBT9K5OfCwnQ8pG3FFjFxJeStN06TcgkF/Dq2JHtMNGK/77rmHbA1Gkv7QOS8b3n+Nj3nptnQrMtFSlkfSlWbF0qapgUJHgmaamNzGcFCK15nxUbUC4n4brRJMH3HxckZ4LlZT4UdMkhw8BcSSNTyUlAknHcWDTJBTFcH8MnMgMMD4afw9txQvYXZEnTx7I4kJBgRbkG3GWYLyA1Ulk5cBZWQLO5ghUoQPlIqCGVIqNqZylTjupBJbvChqLhfDzqh/EwQTmpY8VbxkYxsdbIbhFIaGCAPwQ0/eZVzW/Vmt3Evwr8buD3HhCaMf0Ysye4uSZBy6/7bueeKnyHl3t9vh2Pvy3uw2gyHCAExaldYU8LTQTa4ANtWQZ4JTKdTYeYseZySXnfCY6BryZU0DVk8YaqDHlfb7xWsixG+AKk3YF2E5btjt9urtLLLtDWZdZepcjGjuK9k3iHXmGc0yVw7arHmXi0y2eywYdE3MaYQgeel3JZZrUMtvVcirXMlvVU5h4tmEcNp9rbNr1KjPbeUuIdCqBfFrXLbo/YqvGqVHyFVfqocz3XYJ7C95cKvsilfpVycvTJscfZH69VC1rojTT/o/RP7t560kYG1xP6U6o7ZK/sTLp1n7zGTrbrbQwImtvmPS1WQUt95LiCmXOPKig4S6uREReQumb6Rwt2bYuKMq96G7MblmKNaDcaHB7bn+8MS/WBEhmFNnZIWe8h96ThH8w4ms1ja0UfrQhLfSd5mcPB9HESTgdhZE0o0Jp9WQpDAh+tTksj45Tyylw46GRelNb2fw+ZQkHGcFZs4fzmGvEwkL/EaWDvdNkBcc62xxhwnDx28z2u1tpbwUwqZnYk6Ng/btZMXXHD+5i4uTkTfPdej+vqeTjyNl4MwzhZNKrOfJICRm83R69DXM4B/IDLTw6ppDR9UOZw+iiObqLZLPnaQASqNy+QfjQMk9H0xn51wE7lqjXtR8lN/PMqbp0RIqwL1RDvsPlzpBknMdn/Bp2nzzkbBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e62eb67062fc48ea34d6fc/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "777"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Fri, 28 Mar 2025 05:08:09 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "564"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
rename to test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_1.json
index 5c4a4a2966..a432f39c16 100644
--- a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAHWPwU7DMBBE/2XPsUWbNi25RT1UuaCqEXBAVbXxblyLxgbbiUBV/h23cIAD19mZfTMXOBqCEooVL+ZULJBaLJazHNdq2akuhwwII+68UxzCnrVxFsoLqLMbKKmjIfYpXz03yep/7vBU77f1Q10dH5sKpgy0d8Nb/Qs0+wNqaZ3SJxeixZ4DlC+A8YxBhOgZe/FfO/H64WMnR+O1sQbFEFCifB/Yf8reWe2oFcSjtBzhkMH1eapgbIhoFYv71TxhvxkbZzujr9OiuS1qdvkdTNMXgTwwwSEBAAA=",
+  "Body": "H4sIAAAAAAAAAHWPzWrDMBCE32XPljBxKhffTA/FlxJi2h5KCWtprS7YUiPJhhL87lX6A730Ojuz38wFTmygAVWTqkpT1aXajXp/S1jtaaARCjCY8BC8phiPZNk7aC6gJ7+YrK5sKOR8+9xna/i5w1N3vO8euvb02LewFWCDX967X9COBvUXZNSoc/rNx+RwpgjNC2CaMIqYAuEs/msnzponL1cOlh2jWCJKlOeFwoecvbPeDMLQKh0leC3g+jxXYBcTOk3iRtUZ+824825ke52W+GtRf6hK2LZPqWmMHSEBAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams",
+  "Path": "/api/atlas/v2/groups/67e62eb67062fc48ea34d6fc/streams",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:37:56 GMT"
+      "Fri, 28 Mar 2025 05:17:07 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "244"
+      "130"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_connections_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_instance-567_connections_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_connections_1.json
rename to test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_instance-567_connections_1.json
index a4cdc6d5e8..f7b9e28f0d 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_connections_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e62eb67062fc48ea34d6fc_streams_instance-567_connections_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAKtWSs4pLS5JLfJLzE1VsoLxdI1MDJV0lFKSgvJzUkPyXStSk0tLgPLVSkVAAaC6xJKcxGLHlNzMPKCyksoCkJhTqKdPSLynn1KtjlIexDhniHHO+XlI6qCCSrUArJETlH0AAAA=",
+  "Body": "H4sIAAAAAAAAAKtWSs4pLS5JLfJLzE1VsoLxdE0sLJV0lFKSgvJzUkPyXStSk0tLgPLVSkVAAaC6xJKcxGLHlNzMPKCyksoCkJhTqKdPSLynn1KtjlIexDhniHHO+XlI6qCCSrUA54601X0AAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/streams/instance-257/connections",
+  "Path": "/api/atlas/v2/groups/67e62eb67062fc48ea34d6fc/streams/instance-567/connections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 16:45:10 GMT"
+      "Fri, 28 Mar 2025 05:17:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "133"
+      "126"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+      "gitHash=6940c8e13d6a29893dbafad827d54c5c384bd623; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/memory.json b/test/e2e/.snapshots/TestStreamsWithClusters/memory.json
index 70435e5fed..4a076b658c 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/memory.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/memory.json
@@ -1 +1 @@
-{"clusterGenerateClusterName":"cluster-241","instanceName":"instance-257"}
\ No newline at end of file
+{"clusterGenerateClusterName":"cluster-489","instanceName":"instance-567"}
\ No newline at end of file