Skip to content

CXX-2599 add prose test and upgrade C test dependency #965

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.

Sign up for GitHub

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 2 commits into from
May 18, 2023
Merged

CXX-2599 add prose test and upgrade C test dependency #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84c8bee
update C driver test dependency to 98995b5d9e31768ae02be265e3debe43ec…
kevinAlbs May 17, 2023
6ed28dc
add prose test: 16. Rewrap. Case 2
kevinAlbs May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .mci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
#######################################
variables:

mongoc_version_default: &mongoc_version_default "f14370ea" # TODO: update to 1.24.0 once released.
mongoc_version_default: &mongoc_version_default "98995b5d9e31768ae02be265e3debe43ec35cff8" # TODO: update to 1.24.0 once released.

# If updating mongoc_version_minimum, also update:
# - the default value of --c-driver-build-ref in etc/make_release.py
# - LIBMONGOC_REQUIRED_VERSION in src/mongocxx/CMakeLists.txt
mongoc_version_minimum: &mongoc_version_minimum "f14370ea" # TODO: update to 1.24.0 once released.
mongoc_version_minimum: &mongoc_version_minimum "98995b5d9e31768ae02be265e3debe43ec35cff8" # TODO: update to 1.24.0 once released.

mongodb_version:
version_latest: &version_latest "latest"
Expand Down
2 changes: 1 addition & 1 deletion etc/make_release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
show_default=True,
help='The remote reference which points to the mongodb/mongo-cxx-driver repo')
@click.option('--c-driver-build-ref',
default='f14370ea',
default='98995b5d9e31768ae02be265e3debe43ec35cff8',
show_default=True,
help='When building the C driver, build at this Git reference')
@click.option('--with-c-driver',
Expand Down
21 changes: 21 additions & 0 deletions src/mongocxx/test/client_side_encryption.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3536,4 +3536,25 @@ TEST_CASE("Range Explicit Encryption", "[client_side_encryption]") {
}
}

TEST_CASE("16. Rewrap. Case 2: RewrapManyDataKeyOpts.provider is not optional",
"[client_side_encryption]") {
instance::current();

if (!mongocxx::test_util::should_run_client_side_encryption_test()) {
return;
}

auto keyvault_client = mongocxx::client(mongocxx::uri(), test_util::add_test_server_api());
auto ce_opts = mongocxx::options::client_encryption();
ce_opts.key_vault_client(&keyvault_client);
ce_opts.key_vault_namespace({"keyvault", "datakeys"});
ce_opts.kms_providers(_make_kms_doc(true /* include_external */));

auto clientEncryption = mongocxx::client_encryption(ce_opts);
REQUIRE_THROWS_WITH(
clientEncryption.rewrap_many_datakey(
make_document(), mongocxx::options::rewrap_many_datakey().master_key(make_document())),
Catch::Contains("expected 'provider' to be set to identify type of 'master_key'"));
}

} // namespace