Skip to content

CDRIVER-4817 update compile-libmongocrypt for KMIP delegated #1563

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

Merged
merged 5 commits into from
Apr 2, 2024

Conversation

adriandole
Copy link
Contributor

No description provided.

@adriandole adriandole requested a review from kevinAlbs March 25, 2024 23:11
Copy link
Collaborator

@kevinAlbs kevinAlbs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with an update to the error code.

Co-authored-by: Kevin Albertson <[email protected]>
@kevinAlbs kevinAlbs changed the title MONGOCRYPT-614 update compile-libmongocrypt for KMIP delegated CDRIVER-4817 update compile-libmongocrypt for KMIP delegated Apr 2, 2024
@kevinAlbs kevinAlbs merged commit 930d171 into mongodb:master Apr 2, 2024
@@ -1073,6 +1073,15 @@ _state_machine_run (_state_machine_t *state_machine, bson_t *result, bson_error_
break;
case MONGOCRYPT_CTX_DONE:
goto success;
break;
case MONGOCRYPT_CTX_NEED_MONGO_COLLINFO_WITH_DB:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adriandole this introduced breakage in the PHP driver, where we test with the latest version of libmongoc. The issue is that the current stable libmongocrypt version doesn't have MONGOCRYPT_CTX_NEED_MONGO_COLLINFO_WITH_DB defined, causing a compilation error. This should be wrapped in an #ifdef block unless there is proper documentation that libmongocrypt 1.10 (which hasn't been released yet) or newer is required to compile libmongoc 1.27.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libmongoc 1.27 is expected to release after libmongocrypt 1.10 (CDRIVER-5299 depends on MONGOCRYPT-665). https://github.com/mongodb/mongo-c-driver/pull/1573/files bumps the required libmongocrypt to 1.10.

If updating to a libmongoc 1.27 prerelease, consider also updating libmongocrypt to a 1.10 prerelease containing mongodb/libmongocrypt@1793ff4 (introduces MONGOCRYPT_CTX_NEED_MONGO_COLLINFO_WITH_DB).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants