-
Notifications
You must be signed in to change notification settings - Fork 268
PHPLIB-1704 Upmerge v1.21 into v1.x #1756
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
* Remove serverless tasks/functions from evergreen config * Remove serverless logic in test runners * Remove serverless test groups * Remove mentions of serverless from contributing guide * Fix phpcs thingamabobs
…ollections with autoEncryption enabled (#1745) * PHPLIB-1702: Always consult server encryptedFieldsMap when dropping collections * Bump tests/drivers-evergreen-tools to a332144 Necessary to fix PyMongo compat with MongoDB 4.0 * Detect metadata collections only when auto encryption is enabled on the client * Bump tests/specifications to 0aee4aa Necessary to fix change stream tests for server 8.2+ --------- Co-authored-by: Jérôme Tamarelle <[email protected]>
There is an existing patch(es) for this commit SHA: Please note that the status that is posted is not in the context of this PR but rather the (latest) existing patch and that may affect some tests that may depend on the particular PR. If your tests do not rely on any PR-specific values (like base or head branch name) then your tests will report the same status. If you would like a patch to run in the context of this PR and abort the other(s), comment 'evergreen retry'. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR removes serverless-related functionality from the MongoDB PHP Library as part of an upmerge from v1.21 to v1.x. The changes eliminate serverless testing infrastructure, serverless-specific test annotations, and serverless detection logic.
Key changes:
- Removed serverless detection methods and related environment variable handling
- Eliminated serverless test groups and configuration from test files
- Updated encrypted fields handling to improve collection dropping behavior
- Removed serverless-specific Evergreen CI configuration and test tasks
Reviewed Changes
Copilot reviewed 26 out of 28 changed files in this pull request and generated 2 comments.
Show a summary per file
File | Description |
---|---|
tests/specifications | Updated subproject commit hash |
tests/drivers-evergreen-tools | Updated subproject commit hash |
tests/UnifiedSpecTests/UnifiedTestRunner.php | Removed serverless detection logic and simplified run-on requirements |
tests/UnifiedSpecTests/UnifiedSpecTest.php | Removed serverless test group annotations from test methods |
tests/UnifiedSpecTests/RunOnRequirement.php | Simplified serverless requirement checking logic |
tests/SpecTests/RetryableWrites/Prose3_ReturnOriginalErrorTest.php | Removed serverless test group annotation |
tests/SpecTests/FunctionalTestCase.php | Removed isServerless() method and simplified serverless requirement logic |
tests/SpecTests/ClientSideEncryptionSpecTest.php | Removed serverless test group annotation |
tests/SpecTests/ClientSideEncryption/Prose22_RangeExplicitEncryptionTest.php | Removed serverless test group annotation |
tests/SpecTests/ClientSideEncryption/Prose21_AutomaticDataEncryptionKeysTest.php | Removed serverless test group annotation |
tests/Functions/GetEncryptedFieldsFromServerFunctionalTest.php | Added new test file for encrypted fields functionality |
tests/FunctionalTestCase.php | Removed isServerless() method and related imports |
tests/Database/DatabaseFunctionalTest.php | Added tests for autoEncryptionEnabled option inheritance |
tests/Collection/CollectionFunctionalTest.php | Added tests for autoEncryptionEnabled option inheritance |
src/functions.php | Simplified get_encrypted_fields_from_server function signature |
src/Database.php | Added autoEncryptionEnabled property and improved encrypted fields handling |
src/Collection.php | Added autoEncryptionEnabled property and improved encrypted fields handling |
src/Client.php | Added autoEncryptionEnabled tracking based on autoEncryption driver option |
CONTRIBUTING.md | Removed serverless testing documentation |
.github/workflows/merge-up.yml | Updated workflow action version and added ignored branches configuration |
.evergreen/run-tests.sh | Removed serverless test case |
.evergreen/config/test-tasks.yml | Removed serverless test tasks |
.evergreen/config/test-task-groups.yml | Removed serverless task groups |
.evergreen/config/templates/test-variant/phpc.yml | Removed serverless task group references |
.evergreen/config/templates/test-variant/modern-php-full.yml | Removed serverless task group references |
.evergreen/config/functions.yml | Removed serverless instance management functions |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Related to PHPLIB-1704.
The branch 1.x it considered "more recent" than 1.21.x and is installed by composer with when
stability=dev
.