mongo 2.17.4 → 2.18.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (624) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/README.md +21 -37
  4. data/lib/mongo/auth/base.rb +8 -1
  5. data/lib/mongo/auth.rb +12 -1
  6. data/lib/mongo/bulk_write/result.rb +10 -1
  7. data/lib/mongo/bulk_write/result_combiner.rb +2 -4
  8. data/lib/mongo/bulk_write.rb +108 -28
  9. data/lib/mongo/client.rb +114 -12
  10. data/lib/mongo/client_encryption.rb +30 -9
  11. data/lib/mongo/cluster/reapers/cursor_reaper.rb +11 -1
  12. data/lib/mongo/cluster.rb +20 -24
  13. data/lib/mongo/collection/helpers.rb +43 -0
  14. data/lib/mongo/collection/queryable_encryption.rb +122 -0
  15. data/lib/mongo/collection/view/aggregation.rb +19 -16
  16. data/lib/mongo/collection/view/change_stream.rb +56 -23
  17. data/lib/mongo/collection/view/explainable.rb +1 -1
  18. data/lib/mongo/collection/view/iterable.rb +2 -18
  19. data/lib/mongo/collection/view/map_reduce.rb +18 -9
  20. data/lib/mongo/collection/view/readable.rb +19 -23
  21. data/lib/mongo/collection/view/writable.rb +133 -40
  22. data/lib/mongo/collection/view.rb +0 -1
  23. data/lib/mongo/collection.rb +108 -48
  24. data/lib/mongo/config/options.rb +62 -0
  25. data/lib/mongo/config/validators/option.rb +26 -0
  26. data/lib/mongo/config.rb +31 -0
  27. data/lib/mongo/crypt/auto_encrypter.rb +79 -6
  28. data/lib/mongo/crypt/binding.rb +395 -143
  29. data/lib/mongo/crypt/context.rb +5 -2
  30. data/lib/mongo/crypt/data_key_context.rb +7 -104
  31. data/lib/mongo/crypt/encryption_io.rb +28 -60
  32. data/lib/mongo/crypt/explicit_encrypter.rb +27 -25
  33. data/lib/mongo/crypt/explicit_encryption_context.rb +31 -3
  34. data/lib/mongo/crypt/handle.rb +102 -79
  35. data/lib/mongo/crypt/hooks.rb +25 -2
  36. data/lib/mongo/crypt/kms/aws.rb +128 -0
  37. data/lib/mongo/crypt/kms/azure.rb +136 -0
  38. data/lib/mongo/crypt/kms/credentials.rb +81 -0
  39. data/lib/mongo/crypt/kms/gcp.rb +182 -0
  40. data/lib/mongo/crypt/kms/kmip.rb +110 -0
  41. data/lib/mongo/crypt/kms/local.rb +74 -0
  42. data/lib/mongo/crypt/kms/master_key_document.rb +65 -0
  43. data/lib/mongo/crypt/kms.rb +117 -0
  44. data/lib/mongo/crypt.rb +1 -0
  45. data/lib/mongo/cursor/kill_spec.rb +27 -6
  46. data/lib/mongo/cursor.rb +21 -16
  47. data/lib/mongo/database/view.rb +6 -3
  48. data/lib/mongo/database.rb +73 -12
  49. data/lib/mongo/dbref.rb +1 -105
  50. data/lib/mongo/error/bulk_write_error.rb +31 -4
  51. data/lib/mongo/error/invalid_config_option.rb +20 -0
  52. data/lib/mongo/error/invalid_replacement_document.rb +27 -9
  53. data/lib/mongo/error/invalid_update_document.rb +27 -7
  54. data/lib/mongo/error/labelable.rb +72 -0
  55. data/lib/mongo/error/missing_connection.rb +25 -0
  56. data/lib/mongo/error/notable.rb +7 -0
  57. data/lib/mongo/error/operation_failure.rb +34 -86
  58. data/lib/mongo/error/read_write_retryable.rb +108 -0
  59. data/lib/mongo/{operation/kill_cursors/legacy.rb → error/session_not_materialized.rb} +7 -19
  60. data/lib/mongo/error.rb +5 -37
  61. data/lib/mongo/index/view.rb +22 -7
  62. data/lib/mongo/monitoring/event/command_failed.rb +8 -2
  63. data/lib/mongo/monitoring/event/command_started.rb +1 -1
  64. data/lib/mongo/monitoring/event/command_succeeded.rb +9 -2
  65. data/lib/mongo/monitoring/publishable.rb +9 -5
  66. data/lib/mongo/operation/collections_info/result.rb +5 -2
  67. data/lib/mongo/operation/command/op_msg.rb +6 -0
  68. data/lib/mongo/operation/context.rb +24 -6
  69. data/lib/mongo/operation/count/op_msg.rb +4 -1
  70. data/lib/mongo/operation/create/op_msg.rb +16 -1
  71. data/lib/mongo/operation/create_index/op_msg.rb +2 -1
  72. data/lib/mongo/operation/delete/op_msg.rb +1 -0
  73. data/lib/mongo/operation/delete.rb +0 -1
  74. data/lib/mongo/operation/drop_index/op_msg.rb +5 -1
  75. data/lib/mongo/operation/get_more/command_builder.rb +5 -1
  76. data/lib/mongo/operation/insert/bulk_result.rb +5 -1
  77. data/lib/mongo/operation/insert/command.rb +0 -4
  78. data/lib/mongo/operation/insert/op_msg.rb +6 -3
  79. data/lib/mongo/operation/insert/result.rb +6 -3
  80. data/lib/mongo/operation/insert.rb +0 -1
  81. data/lib/mongo/operation/kill_cursors.rb +0 -1
  82. data/lib/mongo/operation/list_collections/op_msg.rb +4 -1
  83. data/lib/mongo/operation/map_reduce/result.rb +16 -0
  84. data/lib/mongo/operation/result.rb +21 -5
  85. data/lib/mongo/operation/shared/executable.rb +21 -6
  86. data/lib/mongo/operation/shared/polymorphic_operation.rb +15 -3
  87. data/lib/mongo/operation/shared/response_handling.rb +6 -5
  88. data/lib/mongo/operation/shared/sessions_supported.rb +3 -7
  89. data/lib/mongo/operation/shared/write.rb +18 -12
  90. data/lib/mongo/operation/update/op_msg.rb +2 -1
  91. data/lib/mongo/operation/update.rb +0 -1
  92. data/lib/mongo/protocol/caching_hash.rb +69 -0
  93. data/lib/mongo/protocol/msg.rb +37 -1
  94. data/lib/mongo/protocol.rb +1 -0
  95. data/lib/mongo/query_cache.rb +15 -0
  96. data/lib/mongo/retryable.rb +78 -30
  97. data/lib/mongo/server/connection.rb +33 -0
  98. data/lib/mongo/server/connection_base.rb +2 -0
  99. data/lib/mongo/server/connection_common.rb +4 -1
  100. data/lib/mongo/server/connection_pool.rb +69 -42
  101. data/lib/mongo/server/description/features.rb +3 -1
  102. data/lib/mongo/server/description.rb +7 -2
  103. data/lib/mongo/server/monitor/connection.rb +5 -10
  104. data/lib/mongo/server/monitor.rb +21 -13
  105. data/lib/mongo/server/push_monitor.rb +9 -3
  106. data/lib/mongo/server.rb +9 -5
  107. data/lib/mongo/session/session_pool.rb +8 -0
  108. data/lib/mongo/session.rb +111 -35
  109. data/lib/mongo/socket/ocsp_verifier.rb +4 -5
  110. data/lib/mongo/socket/tcp.rb +3 -0
  111. data/lib/mongo/srv/resolver.rb +24 -3
  112. data/lib/mongo/uri/options_mapper.rb +2 -0
  113. data/lib/mongo/uri/srv_protocol.rb +1 -1
  114. data/lib/mongo/uri.rb +20 -0
  115. data/lib/mongo/version.rb +1 -1
  116. data/lib/mongo.rb +20 -0
  117. data/mongo.gemspec +10 -4
  118. data/spec/README.md +5 -5
  119. data/spec/integration/aws_lambda_examples_spec.rb +68 -0
  120. data/spec/integration/bulk_write_error_message_spec.rb +32 -0
  121. data/spec/integration/bulk_write_spec.rb +0 -16
  122. data/spec/integration/change_stream_spec.rb +6 -5
  123. data/spec/integration/client_construction_spec.rb +1 -1
  124. data/spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb +9 -9
  125. data/spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb +18 -19
  126. data/spec/integration/client_side_encryption/auto_encryption_mongocryptd_spawn_spec.rb +0 -1
  127. data/spec/integration/client_side_encryption/auto_encryption_reconnect_spec.rb +31 -0
  128. data/spec/integration/client_side_encryption/auto_encryption_spec.rb +108 -1
  129. data/spec/integration/client_side_encryption/bson_size_limit_spec.rb +2 -2
  130. data/spec/integration/client_side_encryption/bypass_mongocryptd_spawn_spec.rb +2 -2
  131. data/spec/integration/client_side_encryption/client_close_spec.rb +1 -1
  132. data/spec/integration/client_side_encryption/corpus_spec.rb +64 -35
  133. data/spec/integration/client_side_encryption/custom_endpoint_spec.rb +39 -42
  134. data/spec/integration/client_side_encryption/data_key_spec.rb +97 -7
  135. data/spec/integration/client_side_encryption/explicit_encryption_spec.rb +59 -0
  136. data/spec/integration/client_side_encryption/explicit_queryable_encryption_spec.rb +147 -0
  137. data/spec/integration/client_side_encryption/external_key_vault_spec.rb +6 -6
  138. data/spec/integration/client_side_encryption/kms_tls_options_spec.rb +394 -0
  139. data/spec/integration/client_side_encryption/kms_tls_spec.rb +92 -0
  140. data/spec/integration/client_side_encryption/queryable_encryption_examples_spec.rb +111 -0
  141. data/spec/integration/client_side_encryption/views_spec.rb +1 -1
  142. data/spec/integration/client_update_spec.rb +2 -2
  143. data/spec/integration/crud_spec.rb +12 -0
  144. data/spec/integration/cursor_pinning_spec.rb +3 -3
  145. data/spec/integration/fork_reconnect_spec.rb +15 -8
  146. data/spec/integration/grid_fs_bucket_spec.rb +3 -3
  147. data/spec/integration/ocsp_verifier_spec.rb +1 -0
  148. data/spec/integration/query_cache_spec.rb +34 -30
  149. data/spec/integration/retryable_writes/retryable_writes_36_and_older_spec.rb +1 -1
  150. data/spec/integration/sdam_events_spec.rb +0 -40
  151. data/spec/integration/server_monitor_spec.rb +2 -1
  152. data/spec/integration/size_limit_spec.rb +4 -1
  153. data/spec/integration/snapshot_query_examples_spec.rb +127 -0
  154. data/spec/integration/srv_monitoring_spec.rb +37 -0
  155. data/spec/integration/step_down_spec.rb +20 -4
  156. data/spec/integration/transaction_pinning_spec.rb +2 -2
  157. data/spec/integration/versioned_api_examples_spec.rb +37 -31
  158. data/spec/lite_spec_helper.rb +14 -5
  159. data/spec/mongo/address/ipv6_spec.rb +7 -0
  160. data/spec/mongo/address_spec.rb +7 -0
  161. data/spec/mongo/auth/scram/conversation_spec.rb +23 -23
  162. data/spec/mongo/auth/scram256/conversation_spec.rb +20 -20
  163. data/spec/mongo/auth/scram_negotiation_spec.rb +1 -0
  164. data/spec/mongo/bulk_write/result_spec.rb +15 -1
  165. data/spec/mongo/bulk_write_spec.rb +128 -20
  166. data/spec/mongo/client_construction_spec.rb +141 -7
  167. data/spec/mongo/client_encryption_spec.rb +11 -11
  168. data/spec/mongo/client_spec.rb +297 -1
  169. data/spec/mongo/cluster/cursor_reaper_spec.rb +21 -3
  170. data/spec/mongo/cluster_spec.rb +0 -44
  171. data/spec/mongo/collection/view/aggregation_spec.rb +2 -2
  172. data/spec/mongo/collection/view/change_stream_spec.rb +2 -2
  173. data/spec/mongo/collection/view/readable_spec.rb +35 -56
  174. data/spec/mongo/collection/view/writable_spec.rb +144 -32
  175. data/spec/mongo/collection_crud_spec.rb +63 -13
  176. data/spec/mongo/config/options_spec.rb +75 -0
  177. data/spec/mongo/config_spec.rb +73 -0
  178. data/spec/mongo/crypt/auto_decryption_context_spec.rb +17 -1
  179. data/spec/mongo/crypt/auto_encrypter_spec.rb +106 -0
  180. data/spec/mongo/crypt/auto_encryption_context_spec.rb +17 -1
  181. data/spec/mongo/crypt/binding/context_spec.rb +99 -17
  182. data/spec/mongo/crypt/binding/mongocrypt_spec.rb +17 -46
  183. data/spec/mongo/crypt/binding/version_spec.rb +25 -0
  184. data/spec/mongo/crypt/binding_unloaded_spec.rb +14 -0
  185. data/spec/mongo/crypt/data_key_context_spec.rb +42 -114
  186. data/spec/mongo/crypt/encryption_io_spec.rb +2 -0
  187. data/spec/mongo/crypt/explicit_decryption_context_spec.rb +32 -1
  188. data/spec/mongo/crypt/explicit_encryption_context_spec.rb +89 -1
  189. data/spec/mongo/crypt/handle_spec.rb +47 -169
  190. data/spec/mongo/crypt/hooks_spec.rb +30 -0
  191. data/spec/mongo/crypt/kms/credentials_spec.rb +404 -0
  192. data/spec/mongo/crypt/kms_spec.rb +59 -0
  193. data/spec/mongo/cursor_spec.rb +37 -51
  194. data/spec/mongo/database_spec.rb +66 -1
  195. data/spec/mongo/error/operation_failure_heavy_spec.rb +49 -0
  196. data/spec/mongo/index/view_spec.rb +69 -0
  197. data/spec/mongo/operation/create/op_msg_spec.rb +286 -0
  198. data/spec/mongo/operation/delete/op_msg_spec.rb +13 -4
  199. data/spec/mongo/operation/delete_spec.rb +0 -30
  200. data/spec/mongo/operation/insert/op_msg_spec.rb +18 -10
  201. data/spec/mongo/operation/insert_spec.rb +0 -32
  202. data/spec/mongo/operation/result_spec.rb +20 -0
  203. data/spec/mongo/operation/update/op_msg_spec.rb +13 -4
  204. data/spec/mongo/operation/update_spec.rb +0 -29
  205. data/spec/mongo/protocol/caching_hash_spec.rb +82 -0
  206. data/spec/mongo/protocol/msg_spec.rb +41 -0
  207. data/spec/mongo/query_cache_spec.rb +1 -0
  208. data/spec/mongo/retryable_spec.rb +32 -3
  209. data/spec/mongo/server/connection_auth_spec.rb +3 -1
  210. data/spec/mongo/server/connection_common_spec.rb +13 -1
  211. data/spec/mongo/server/connection_pool_spec.rb +94 -49
  212. data/spec/mongo/server/connection_spec.rb +50 -159
  213. data/spec/mongo/server/description/features_spec.rb +24 -0
  214. data/spec/mongo/server/push_monitor_spec.rb +2 -8
  215. data/spec/mongo/session_spec.rb +26 -6
  216. data/spec/mongo/session_transaction_spec.rb +2 -1
  217. data/spec/mongo/socket/ssl_spec.rb +15 -4
  218. data/spec/mongo/uri/srv_protocol_spec.rb +101 -2
  219. data/spec/mongo/uri_spec.rb +25 -0
  220. data/spec/runners/connection_string.rb +8 -0
  221. data/spec/runners/crud/operation.rb +12 -3
  222. data/spec/runners/crud/requirement.rb +3 -3
  223. data/spec/runners/crud/spec.rb +5 -0
  224. data/spec/runners/crud/verifier.rb +6 -0
  225. data/spec/runners/transactions/test.rb +33 -14
  226. data/spec/runners/transactions.rb +9 -6
  227. data/spec/runners/unified/assertions.rb +59 -10
  228. data/spec/runners/unified/change_stream_operations.rb +9 -0
  229. data/spec/runners/unified/crud_operations.rb +50 -2
  230. data/spec/runners/unified/ddl_operations.rb +20 -0
  231. data/spec/runners/unified/error.rb +2 -1
  232. data/spec/runners/unified/support_operations.rb +5 -2
  233. data/spec/runners/unified/test.rb +19 -4
  234. data/spec/runners/unified.rb +9 -2
  235. data/spec/shared/lib/mrss/constraints.rb +10 -17
  236. data/spec/shared/lib/mrss/docker_runner.rb +21 -3
  237. data/spec/shared/lib/mrss/lite_constraints.rb +32 -1
  238. data/spec/shared/lib/mrss/session_registry.rb +69 -0
  239. data/spec/shared/lib/mrss/session_registry_legacy.rb +60 -0
  240. data/spec/shared/share/Dockerfile.erb +56 -54
  241. data/spec/shared/shlib/config.sh +27 -0
  242. data/spec/shared/shlib/distro.sh +2 -1
  243. data/spec/shared/shlib/server.sh +46 -21
  244. data/spec/shared/shlib/set_env.sh +40 -5
  245. data/spec/spec_helper.rb +0 -1
  246. data/spec/spec_tests/crud_spec.rb +0 -10
  247. data/spec/spec_tests/data/change_streams_unified/change-streams-errors.yml +124 -0
  248. data/spec/spec_tests/data/change_streams_unified/change-streams-pre_and_post_images.yml +351 -0
  249. data/spec/spec_tests/data/change_streams_unified/change-streams-resume-allowlist.yml +1171 -0
  250. data/spec/spec_tests/data/change_streams_unified/change-streams-resume-errorLabels.yml +1068 -0
  251. data/spec/spec_tests/data/change_streams_unified/change-streams.yml +859 -4
  252. data/spec/spec_tests/data/client_side_encryption/aggregate.yml +3 -17
  253. data/spec/spec_tests/data/client_side_encryption/azureKMS.yml +46 -0
  254. data/spec/spec_tests/data/client_side_encryption/badQueries.yml +12 -2
  255. data/spec/spec_tests/data/client_side_encryption/basic.yml +3 -17
  256. data/spec/spec_tests/data/client_side_encryption/bulk.yml +1 -8
  257. data/spec/spec_tests/data/client_side_encryption/bypassAutoEncryption.yml +2 -2
  258. data/spec/spec_tests/data/client_side_encryption/count.yml +1 -8
  259. data/spec/spec_tests/data/client_side_encryption/countDocuments.yml +1 -8
  260. data/spec/spec_tests/data/client_side_encryption/delete.yml +2 -16
  261. data/spec/spec_tests/data/client_side_encryption/distinct.yml +1 -8
  262. data/spec/spec_tests/data/client_side_encryption/explain.yml +1 -8
  263. data/spec/spec_tests/data/client_side_encryption/find.yml +2 -16
  264. data/spec/spec_tests/data/client_side_encryption/findOneAndDelete.yml +1 -8
  265. data/spec/spec_tests/data/client_side_encryption/findOneAndReplace.yml +1 -8
  266. data/spec/spec_tests/data/client_side_encryption/findOneAndUpdate.yml +1 -8
  267. data/spec/spec_tests/data/client_side_encryption/fle2-BypassQueryAnalysis.yml +101 -0
  268. data/spec/spec_tests/data/client_side_encryption/fle2-Compact.yml +80 -0
  269. data/spec/spec_tests/data/client_side_encryption/fle2-CreateCollection.yml +1263 -0
  270. data/spec/spec_tests/data/client_side_encryption/fle2-DecryptExistingData.yml +64 -0
  271. data/spec/spec_tests/data/client_side_encryption/fle2-Delete.yml +107 -0
  272. data/spec/spec_tests/data/client_side_encryption/fle2-EncryptedFields-vs-EncryptedFieldsMap.yml +80 -0
  273. data/spec/spec_tests/data/client_side_encryption/fle2-EncryptedFields-vs-jsonSchema.yml +90 -0
  274. data/spec/spec_tests/data/client_side_encryption/fle2-EncryptedFieldsMap-defaults.yml +57 -0
  275. data/spec/spec_tests/data/client_side_encryption/fle2-FindOneAndUpdate.yml +213 -0
  276. data/spec/spec_tests/data/client_side_encryption/fle2-InsertFind-Indexed.yml +86 -0
  277. data/spec/spec_tests/data/client_side_encryption/fle2-InsertFind-Unindexed.yml +83 -0
  278. data/spec/spec_tests/data/client_side_encryption/fle2-MissingKey.yml +41 -0
  279. data/spec/spec_tests/data/client_side_encryption/fle2-NoEncryption.yml +42 -0
  280. data/spec/spec_tests/data/client_side_encryption/fle2-Update.yml +221 -0
  281. data/spec/spec_tests/data/client_side_encryption/fle2-validatorAndPartialFieldExpression.yml +168 -0
  282. data/spec/spec_tests/data/client_side_encryption/gcpKMS.yml +46 -0
  283. data/spec/spec_tests/data/client_side_encryption/getMore.yml +1 -8
  284. data/spec/spec_tests/data/client_side_encryption/insert.yml +2 -16
  285. data/spec/spec_tests/data/client_side_encryption/keyAltName.yml +1 -8
  286. data/spec/spec_tests/data/client_side_encryption/localKMS.yml +1 -8
  287. data/spec/spec_tests/data/client_side_encryption/localSchema.yml +1 -8
  288. data/spec/spec_tests/data/client_side_encryption/maxWireVersion.yml +2 -0
  289. data/spec/spec_tests/data/client_side_encryption/missingKey.yml +2 -9
  290. data/spec/spec_tests/data/client_side_encryption/noSchema.yml +39 -0
  291. data/spec/spec_tests/data/client_side_encryption/replaceOne.yml +1 -8
  292. data/spec/spec_tests/data/client_side_encryption/types.yml +44 -70
  293. data/spec/spec_tests/data/client_side_encryption/updateMany.yml +1 -8
  294. data/spec/spec_tests/data/client_side_encryption/updateOne.yml +1 -8
  295. data/spec/spec_tests/data/collection_management/clustered-indexes.yml +135 -0
  296. data/spec/spec_tests/data/collection_management/createCollection-pre_and_post_images.yml +50 -0
  297. data/spec/spec_tests/data/collection_management/modifyCollection-pre_and_post_images.yml +58 -0
  298. data/spec/spec_tests/data/command_monitoring_unified/pre-42-server-connection-id.yml +56 -0
  299. data/spec/spec_tests/data/command_monitoring_unified/server-connection-id.yml +56 -0
  300. data/spec/spec_tests/data/crud/read/aggregate-collation.yml +1 -1
  301. data/spec/spec_tests/data/crud/read/count-collation.yml +1 -1
  302. data/spec/spec_tests/data/crud/read/distinct-collation.yml +1 -1
  303. data/spec/spec_tests/data/crud/read/find-collation.yml +1 -1
  304. data/spec/spec_tests/data/crud/write/bulkWrite-collation.yml +1 -1
  305. data/spec/spec_tests/data/crud/write/deleteMany-collation.yml +1 -1
  306. data/spec/spec_tests/data/crud/write/deleteOne-collation.yml +1 -1
  307. data/spec/spec_tests/data/crud/write/findOneAndDelete-collation.yml +1 -1
  308. data/spec/spec_tests/data/crud/write/findOneAndReplace-collation.yml +1 -1
  309. data/spec/spec_tests/data/crud/write/findOneAndUpdate-collation.yml +1 -1
  310. data/spec/spec_tests/data/crud/write/replaceOne-collation.yml +1 -1
  311. data/spec/spec_tests/data/crud/write/updateMany-collation.yml +1 -1
  312. data/spec/spec_tests/data/crud/write/updateOne-collation.yml +1 -1
  313. data/spec/spec_tests/data/crud_unified/aggregate-allowdiskuse.yml +75 -0
  314. data/spec/spec_tests/data/crud_unified/aggregate-merge.yml +185 -0
  315. data/spec/spec_tests/data/crud_unified/aggregate-out-readConcern.yml +171 -0
  316. data/spec/spec_tests/data/crud_unified/aggregate.yml +215 -0
  317. data/spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters-clientError.yml +98 -0
  318. data/spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters.yml +174 -0
  319. data/spec/spec_tests/data/crud_unified/bulkWrite-comment.yml +189 -0
  320. data/spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-clientError.yml +113 -0
  321. data/spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-serverError.yml +142 -0
  322. data/spec/spec_tests/data/crud_unified/bulkWrite-delete-hint.yml +154 -0
  323. data/spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-hint-unacknowledged.yml +98 -0
  324. data/spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-let.yml +86 -0
  325. data/spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-hint-unacknowledged.yml +97 -0
  326. data/spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-let.yml +86 -0
  327. data/spec/spec_tests/data/crud_unified/bulkWrite-insertOne-dots_and_dollars.yml +138 -0
  328. data/spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-dots_and_dollars.yml +165 -0
  329. data/spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-hint-unacknowledged.yml +103 -0
  330. data/spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-let.yml +93 -0
  331. data/spec/spec_tests/data/crud_unified/bulkWrite-update-hint-clientError.yml +148 -0
  332. data/spec/spec_tests/data/crud_unified/bulkWrite-update-hint-serverError.yml +239 -0
  333. data/spec/spec_tests/data/crud_unified/bulkWrite-update-hint.yml +256 -0
  334. data/spec/spec_tests/data/crud_unified/bulkWrite-update-validation.yml +73 -0
  335. data/spec/spec_tests/data/crud_unified/bulkWrite-updateMany-dots_and_dollars.yml +150 -0
  336. data/spec/spec_tests/data/crud_unified/bulkWrite-updateMany-hint-unacknowledged.yml +104 -0
  337. data/spec/spec_tests/data/crud_unified/bulkWrite-updateMany-let.yml +96 -0
  338. data/spec/spec_tests/data/crud_unified/bulkWrite-updateOne-dots_and_dollars.yml +150 -0
  339. data/spec/spec_tests/data/crud_unified/bulkWrite-updateOne-hint-unacknowledged.yml +103 -0
  340. data/spec/spec_tests/data/crud_unified/bulkWrite-updateOne-let.yml +95 -0
  341. data/spec/spec_tests/data/crud_unified/countDocuments-comment.yml +92 -0
  342. data/spec/spec_tests/data/crud_unified/db-aggregate.yml +73 -0
  343. data/spec/spec_tests/data/crud_unified/deleteMany-comment.yml +97 -0
  344. data/spec/spec_tests/data/crud_unified/deleteMany-hint-clientError.yml +87 -0
  345. data/spec/spec_tests/data/crud_unified/deleteMany-hint-serverError.yml +107 -0
  346. data/spec/spec_tests/data/crud_unified/deleteMany-hint-unacknowledged.yml +90 -0
  347. data/spec/spec_tests/data/crud_unified/deleteMany-hint.yml +99 -0
  348. data/spec/spec_tests/data/crud_unified/deleteMany-let.yml +2 -0
  349. data/spec/spec_tests/data/crud_unified/deleteOne-comment.yml +98 -0
  350. data/spec/spec_tests/data/crud_unified/deleteOne-hint-clientError.yml +80 -0
  351. data/spec/spec_tests/data/crud_unified/deleteOne-hint-serverError.yml +100 -0
  352. data/spec/spec_tests/data/crud_unified/deleteOne-hint-unacknowledged.yml +89 -0
  353. data/spec/spec_tests/data/crud_unified/deleteOne-hint.yml +95 -0
  354. data/spec/spec_tests/data/crud_unified/deleteOne-let.yml +2 -0
  355. data/spec/spec_tests/data/crud_unified/estimatedDocumentCount-comment.yml +95 -0
  356. data/spec/spec_tests/data/crud_unified/estimatedDocumentCount.yml +5 -135
  357. data/spec/spec_tests/data/crud_unified/find-allowdiskuse-clientError.yml +55 -0
  358. data/spec/spec_tests/data/crud_unified/find-allowdiskuse-serverError.yml +68 -0
  359. data/spec/spec_tests/data/crud_unified/find-allowdiskuse.yml +79 -0
  360. data/spec/spec_tests/data/crud_unified/find-comment.yml +166 -0
  361. data/spec/spec_tests/data/crud_unified/find.yml +68 -0
  362. data/spec/spec_tests/data/crud_unified/findOneAndDelete-comment.yml +96 -0
  363. data/spec/spec_tests/data/crud_unified/findOneAndDelete-hint-clientError.yml +91 -0
  364. data/spec/spec_tests/data/crud_unified/findOneAndDelete-hint-serverError.yml +107 -0
  365. data/spec/spec_tests/data/crud_unified/findOneAndDelete-hint-unacknowledged.yml +88 -0
  366. data/spec/spec_tests/data/crud_unified/findOneAndDelete-hint.yml +102 -0
  367. data/spec/spec_tests/data/crud_unified/findOneAndDelete-let.yml +2 -4
  368. data/spec/spec_tests/data/crud_unified/findOneAndReplace-comment.yml +101 -0
  369. data/spec/spec_tests/data/crud_unified/findOneAndReplace-dots_and_dollars.yml +140 -0
  370. data/spec/spec_tests/data/crud_unified/findOneAndReplace-hint-clientError.yml +83 -0
  371. data/spec/spec_tests/data/crud_unified/findOneAndReplace-hint-serverError.yml +99 -0
  372. data/spec/spec_tests/data/crud_unified/findOneAndReplace-hint-unacknowledged.yml +96 -0
  373. data/spec/spec_tests/data/crud_unified/findOneAndReplace-hint.yml +98 -0
  374. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-comment.yml +95 -0
  375. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-dots_and_dollars.yml +127 -0
  376. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-clientError.yml +84 -0
  377. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-serverError.yml +100 -0
  378. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-unacknowledged.yml +92 -0
  379. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-hint.yml +99 -0
  380. data/spec/spec_tests/data/crud_unified/insertMany-comment.yml +93 -0
  381. data/spec/spec_tests/data/crud_unified/insertMany-dots_and_dollars.yml +128 -0
  382. data/spec/spec_tests/data/crud_unified/insertOne-comment.yml +91 -0
  383. data/spec/spec_tests/data/crud_unified/insertOne-dots_and_dollars.yml +238 -0
  384. data/spec/spec_tests/data/crud_unified/replaceOne-comment.yml +105 -0
  385. data/spec/spec_tests/data/crud_unified/replaceOne-dots_and_dollars.yml +180 -0
  386. data/spec/spec_tests/data/crud_unified/replaceOne-hint-unacknowledged.yml +95 -0
  387. data/spec/spec_tests/data/crud_unified/replaceOne-hint.yml +108 -0
  388. data/spec/spec_tests/data/crud_unified/replaceOne-let.yml +98 -0
  389. data/spec/spec_tests/data/crud_unified/replaceOne-validation.yml +37 -0
  390. data/spec/spec_tests/data/crud_unified/updateMany-comment.yml +104 -0
  391. data/spec/spec_tests/data/crud_unified/updateMany-dots_and_dollars.yml +138 -0
  392. data/spec/spec_tests/data/crud_unified/updateMany-hint-clientError.yml +91 -0
  393. data/spec/spec_tests/data/crud_unified/updateMany-hint-serverError.yml +115 -0
  394. data/spec/spec_tests/data/crud_unified/updateMany-hint-unacknowledged.yml +96 -0
  395. data/spec/spec_tests/data/crud_unified/updateMany-hint.yml +115 -0
  396. data/spec/spec_tests/data/crud_unified/updateMany-let.yml +5 -1
  397. data/spec/spec_tests/data/crud_unified/updateMany-validation.yml +39 -0
  398. data/spec/spec_tests/data/crud_unified/updateOne-comment.yml +104 -0
  399. data/spec/spec_tests/data/crud_unified/updateOne-dots_and_dollars.yml +138 -0
  400. data/spec/spec_tests/data/crud_unified/updateOne-hint-clientError.yml +85 -0
  401. data/spec/spec_tests/data/crud_unified/updateOne-hint-serverError.yml +109 -0
  402. data/spec/spec_tests/data/crud_unified/updateOne-hint-unacknowledged.yml +95 -0
  403. data/spec/spec_tests/data/crud_unified/updateOne-hint.yml +109 -0
  404. data/spec/spec_tests/data/crud_unified/updateOne-let.yml +5 -1
  405. data/spec/spec_tests/data/crud_unified/updateOne-validation.yml +37 -0
  406. data/spec/spec_tests/data/crud_unified/updateWithPipelines.yml +8 -14
  407. data/spec/spec_tests/data/retryable_reads/{estimatedDocumentCount-serverErrors-pre4.9.yml → legacy/estimatedDocumentCount-serverErrors.yml} +0 -2
  408. data/spec/spec_tests/data/retryable_reads/{estimatedDocumentCount-pre4.9.yml → legacy/estimatedDocumentCount.yml} +0 -2
  409. data/spec/spec_tests/data/retryable_reads/unified/handshakeError.yml +129 -0
  410. data/spec/spec_tests/data/retryable_writes/{bulkWrite-serverErrors.yml → legacy/bulkWrite-serverErrors.yml} +1 -1
  411. data/spec/spec_tests/data/retryable_writes/{deleteOne-serverErrors.yml → legacy/deleteOne-serverErrors.yml} +1 -1
  412. data/spec/spec_tests/data/retryable_writes/{findOneAndDelete-serverErrors.yml → legacy/findOneAndDelete-serverErrors.yml} +1 -1
  413. data/spec/spec_tests/data/retryable_writes/{findOneAndReplace-serverErrors.yml → legacy/findOneAndReplace-serverErrors.yml} +1 -1
  414. data/spec/spec_tests/data/retryable_writes/{findOneAndUpdate-serverErrors.yml → legacy/findOneAndUpdate-serverErrors.yml} +1 -1
  415. data/spec/spec_tests/data/retryable_writes/{insertMany-serverErrors.yml → legacy/insertMany-serverErrors.yml} +1 -1
  416. data/spec/spec_tests/data/retryable_writes/{insertOne-serverErrors.yml → legacy/insertOne-serverErrors.yml} +5 -5
  417. data/spec/spec_tests/data/retryable_writes/{replaceOne-serverErrors.yml → legacy/replaceOne-serverErrors.yml} +1 -1
  418. data/spec/spec_tests/data/retryable_writes/{updateOne-serverErrors.yml → legacy/updateOne-serverErrors.yml} +1 -1
  419. data/spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml +96 -0
  420. data/spec/spec_tests/data/retryable_writes/unified/handshakeError.yml +137 -0
  421. data/spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml +78 -0
  422. data/spec/spec_tests/data/sdam/errors/prefer-error-code.yml +2 -2
  423. data/spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-no-results.yml +5 -0
  424. data/spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml +5 -0
  425. data/spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml +5 -0
  426. data/spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero-txt.yml +10 -0
  427. data/spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero.yml +10 -0
  428. data/spec/spec_tests/data/seed_list_discovery/replica-set/srv-service-name.yml +11 -0
  429. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml +5 -0
  430. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml +5 -0
  431. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml +16 -0
  432. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml +15 -0
  433. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-less_than_srv_records.yml +15 -0
  434. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero-txt.yml +15 -0
  435. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero.yml +15 -0
  436. data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-equal_to_srv_records.yml +13 -0
  437. data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-greater_than_srv_records.yml +12 -0
  438. data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-less_than_srv_records.yml +10 -0
  439. data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-zero.yml +11 -0
  440. data/spec/spec_tests/data/server_selection/Unknown/read/ghost.yml +11 -0
  441. data/spec/spec_tests/data/server_selection/Unknown/write/ghost.yml +11 -0
  442. data/spec/spec_tests/data/sessions_unified/driver-sessions-server-support.yml +123 -0
  443. data/spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-client-error.yml +9 -3
  444. data/spec/spec_tests/data/transactions/error-labels.yml +1 -1
  445. data/spec/spec_tests/data/transactions/errors-client.yml +8 -9
  446. data/spec/spec_tests/data/transactions/mongos-recovery-token.yml +1 -1
  447. data/spec/spec_tests/data/transactions/retryable-abort-errorLabels.yml +0 -2
  448. data/spec/spec_tests/data/transactions/retryable-abort.yml +7 -9
  449. data/spec/spec_tests/data/transactions/retryable-commit-errorLabels.yml +0 -2
  450. data/spec/spec_tests/data/transactions/retryable-commit.yml +7 -9
  451. data/spec/spec_tests/data/transactions/retryable-writes.yml +0 -2
  452. data/spec/spec_tests/data/unified/invalid/expectedEventsForClient-ignoreExtraEvents-type.yml +15 -0
  453. data/spec/spec_tests/data/unified/valid-fail/operation-unsupported.yml +13 -0
  454. data/spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml +78 -0
  455. data/spec/spec_tests/data/unified/valid-pass/poc-change-streams.yml +4 -1
  456. data/spec/spec_tests/data/unified/valid-pass/poc-command-monitoring.yml +3 -3
  457. data/spec/spec_tests/data/unified/valid-pass/poc-transactions.yml +3 -2
  458. data/spec/spec_tests/data/uri_options/srv-options.yml +96 -0
  459. data/spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml +6 -4
  460. data/spec/spec_tests/data/versioned_api/crud-api-version-1.yml +7 -5
  461. data/spec/spec_tests/retryable_reads_spec.rb +4 -1
  462. data/spec/spec_tests/retryable_reads_unified_spec.rb +22 -0
  463. data/spec/spec_tests/retryable_writes_spec.rb +4 -1
  464. data/spec/spec_tests/retryable_writes_unified_spec.rb +21 -0
  465. data/spec/spec_tests/seed_list_discovery_spec.rb +10 -1
  466. data/spec/spec_tests/unified_spec.rb +6 -1
  467. data/spec/stress/connection_pool_timing_spec.rb +2 -1
  468. data/spec/stress/fork_reconnect_stress_spec.rb +3 -2
  469. data/spec/support/authorization.rb +1 -1
  470. data/spec/support/certificates/atlas-ocsp-ca.crt +47 -40
  471. data/spec/support/certificates/atlas-ocsp.crt +106 -101
  472. data/spec/support/cluster_tools.rb +1 -1
  473. data/spec/support/common_shortcuts.rb +22 -0
  474. data/spec/support/crypt/corpus/corpus-encrypted.json +9515 -0
  475. data/spec/support/crypt/corpus/corpus-key-aws.json +32 -32
  476. data/spec/support/crypt/corpus/corpus-key-azure.json +33 -0
  477. data/spec/support/crypt/corpus/corpus-key-gcp.json +35 -0
  478. data/spec/support/crypt/corpus/corpus-key-kmip.json +32 -0
  479. data/spec/support/crypt/corpus/corpus-key-local.json +30 -30
  480. data/spec/support/crypt/corpus/corpus-schema.json +4399 -121
  481. data/spec/support/crypt/corpus/corpus.json +4999 -37
  482. data/spec/support/crypt/data_keys/key_document_azure.json +33 -0
  483. data/spec/support/crypt/data_keys/key_document_gcp.json +37 -0
  484. data/spec/support/crypt/data_keys/key_document_kmip.json +32 -0
  485. data/spec/support/crypt/encryptedFields.json +33 -0
  486. data/spec/support/crypt/keys/key1-document.json +30 -0
  487. data/spec/support/crypt/schema_maps/schema_map_azure.json +17 -0
  488. data/spec/support/crypt/schema_maps/schema_map_azure_key_alt_names.json +12 -0
  489. data/spec/support/crypt/schema_maps/schema_map_gcp.json +17 -0
  490. data/spec/support/crypt/schema_maps/schema_map_gcp_key_alt_names.json +12 -0
  491. data/spec/support/crypt/schema_maps/schema_map_kmip.json +17 -0
  492. data/spec/support/crypt/schema_maps/schema_map_kmip_key_alt_names.json +12 -0
  493. data/spec/support/crypt.rb +207 -6
  494. data/spec/support/macros.rb +18 -0
  495. data/spec/support/mongos_macros.rb +17 -0
  496. data/spec/support/shared/scram_conversation.rb +2 -1
  497. data/spec/support/shared/session.rb +13 -7
  498. data/spec/support/spec_config.rb +82 -1
  499. data/spec/support/utils.rb +25 -4
  500. data.tar.gz.sig +0 -0
  501. metadata +1499 -1252
  502. metadata.gz.sig +0 -0
  503. data/lib/mongo/operation/delete/legacy.rb +0 -64
  504. data/lib/mongo/operation/insert/legacy.rb +0 -68
  505. data/lib/mongo/operation/update/legacy/result.rb +0 -112
  506. data/lib/mongo/operation/update/legacy.rb +0 -76
  507. data/spec/integration/find_options_spec.rb +0 -227
  508. data/spec/mongo/dbref_spec.rb +0 -152
  509. data/spec/mongo/operation/kill_cursors_spec.rb +0 -47
  510. data/spec/spec_tests/change_streams_spec.rb +0 -93
  511. data/spec/spec_tests/data/change_streams/change-streams-errors.yml +0 -101
  512. data/spec/spec_tests/data/change_streams/change-streams-resume-allowlist.yml +0 -1173
  513. data/spec/spec_tests/data/change_streams/change-streams-resume-errorLabels.yml +0 -1105
  514. data/spec/spec_tests/data/change_streams/change-streams.yml +0 -535
  515. data/spec/spec_tests/data/crud_v2/aggregate-merge.yml +0 -103
  516. data/spec/spec_tests/data/crud_v2/aggregate-out-readConcern.yml +0 -111
  517. data/spec/spec_tests/data/crud_v2/bulkWrite-arrayFilters.yml +0 -103
  518. data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint-clientError.yml +0 -63
  519. data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint-serverError.yml +0 -92
  520. data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint.yml +0 -103
  521. data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint-clientError.yml +0 -90
  522. data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint-serverError.yml +0 -147
  523. data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint.yml +0 -164
  524. data/spec/spec_tests/data/crud_v2/db-aggregate.yml +0 -39
  525. data/spec/spec_tests/data/crud_v2/deleteMany-hint-clientError.yml +0 -43
  526. data/spec/spec_tests/data/crud_v2/deleteMany-hint-serverError.yml +0 -62
  527. data/spec/spec_tests/data/crud_v2/deleteMany-hint.yml +0 -58
  528. data/spec/spec_tests/data/crud_v2/deleteOne-hint-clientError.yml +0 -41
  529. data/spec/spec_tests/data/crud_v2/deleteOne-hint-serverError.yml +0 -60
  530. data/spec/spec_tests/data/crud_v2/deleteOne-hint.yml +0 -57
  531. data/spec/spec_tests/data/crud_v2/find-allowdiskuse-clientError.yml +0 -28
  532. data/spec/spec_tests/data/crud_v2/find-allowdiskuse-serverError.yml +0 -44
  533. data/spec/spec_tests/data/crud_v2/find-allowdiskuse.yml +0 -50
  534. data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint-clientError.yml +0 -45
  535. data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint-serverError.yml +0 -60
  536. data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint.yml +0 -56
  537. data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint-clientError.yml +0 -40
  538. data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint-serverError.yml +0 -59
  539. data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint.yml +0 -55
  540. data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint-clientError.yml +0 -40
  541. data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint-serverError.yml +0 -58
  542. data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint.yml +0 -55
  543. data/spec/spec_tests/data/crud_v2/replaceOne-hint.yml +0 -61
  544. data/spec/spec_tests/data/crud_v2/unacknowledged-bulkWrite-delete-hint-clientError.yml +0 -60
  545. data/spec/spec_tests/data/crud_v2/unacknowledged-bulkWrite-update-hint-clientError.yml +0 -88
  546. data/spec/spec_tests/data/crud_v2/unacknowledged-deleteMany-hint-clientError.yml +0 -40
  547. data/spec/spec_tests/data/crud_v2/unacknowledged-deleteOne-hint-clientError.yml +0 -38
  548. data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndDelete-hint-clientError.yml +0 -42
  549. data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndReplace-hint-clientError.yml +0 -40
  550. data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndUpdate-hint-clientError.yml +0 -40
  551. data/spec/spec_tests/data/crud_v2/unacknowledged-replaceOne-hint-clientError.yml +0 -40
  552. data/spec/spec_tests/data/crud_v2/unacknowledged-updateMany-hint-clientError.yml +0 -43
  553. data/spec/spec_tests/data/crud_v2/unacknowledged-updateOne-hint-clientError.yml +0 -40
  554. data/spec/spec_tests/data/crud_v2/updateMany-hint-clientError.yml +0 -45
  555. data/spec/spec_tests/data/crud_v2/updateMany-hint-serverError.yml +0 -66
  556. data/spec/spec_tests/data/crud_v2/updateMany-hint.yml +0 -65
  557. data/spec/spec_tests/data/crud_v2/updateOne-hint-clientError.yml +0 -43
  558. data/spec/spec_tests/data/crud_v2/updateOne-hint-serverError.yml +0 -62
  559. data/spec/spec_tests/data/crud_v2/updateOne-hint.yml +0 -61
  560. data/spec/spec_tests/data/crud_v2/updateWithPipelines.yml +0 -157
  561. data/spec/spec_tests/data/retryable_reads/estimatedDocumentCount-4.9.yml +0 -60
  562. data/spec/spec_tests/data/retryable_reads/estimatedDocumentCount-serverErrors-4.9.yml +0 -146
  563. data/spec/support/crypt/corpus/corpus_encrypted.json +0 -4152
  564. data/spec/support/session_registry.rb +0 -55
  565. /data/spec/spec_tests/data/retryable_reads/{aggregate-merge.yml → legacy/aggregate-merge.yml} +0 -0
  566. /data/spec/spec_tests/data/retryable_reads/{aggregate-serverErrors.yml → legacy/aggregate-serverErrors.yml} +0 -0
  567. /data/spec/spec_tests/data/retryable_reads/{aggregate.yml → legacy/aggregate.yml} +0 -0
  568. /data/spec/spec_tests/data/retryable_reads/{changeStreams-client.watch-serverErrors.yml → legacy/changeStreams-client.watch-serverErrors.yml} +0 -0
  569. /data/spec/spec_tests/data/retryable_reads/{changeStreams-client.watch.yml → legacy/changeStreams-client.watch.yml} +0 -0
  570. /data/spec/spec_tests/data/retryable_reads/{changeStreams-db.coll.watch-serverErrors.yml → legacy/changeStreams-db.coll.watch-serverErrors.yml} +0 -0
  571. /data/spec/spec_tests/data/retryable_reads/{changeStreams-db.coll.watch.yml → legacy/changeStreams-db.coll.watch.yml} +0 -0
  572. /data/spec/spec_tests/data/retryable_reads/{changeStreams-db.watch-serverErrors.yml → legacy/changeStreams-db.watch-serverErrors.yml} +0 -0
  573. /data/spec/spec_tests/data/retryable_reads/{changeStreams-db.watch.yml → legacy/changeStreams-db.watch.yml} +0 -0
  574. /data/spec/spec_tests/data/retryable_reads/{count-serverErrors.yml → legacy/count-serverErrors.yml} +0 -0
  575. /data/spec/spec_tests/data/retryable_reads/{count.yml → legacy/count.yml} +0 -0
  576. /data/spec/spec_tests/data/retryable_reads/{countDocuments-serverErrors.yml → legacy/countDocuments-serverErrors.yml} +0 -0
  577. /data/spec/spec_tests/data/retryable_reads/{countDocuments.yml → legacy/countDocuments.yml} +0 -0
  578. /data/spec/spec_tests/data/retryable_reads/{distinct-serverErrors.yml → legacy/distinct-serverErrors.yml} +0 -0
  579. /data/spec/spec_tests/data/retryable_reads/{distinct.yml → legacy/distinct.yml} +0 -0
  580. /data/spec/spec_tests/data/retryable_reads/{find-serverErrors.yml → legacy/find-serverErrors.yml} +0 -0
  581. /data/spec/spec_tests/data/retryable_reads/{find.yml → legacy/find.yml} +0 -0
  582. /data/spec/spec_tests/data/retryable_reads/{findOne-serverErrors.yml → legacy/findOne-serverErrors.yml} +0 -0
  583. /data/spec/spec_tests/data/retryable_reads/{findOne.yml → legacy/findOne.yml} +0 -0
  584. /data/spec/spec_tests/data/retryable_reads/{gridfs-download-serverErrors.yml → legacy/gridfs-download-serverErrors.yml} +0 -0
  585. /data/spec/spec_tests/data/retryable_reads/{gridfs-download.yml → legacy/gridfs-download.yml} +0 -0
  586. /data/spec/spec_tests/data/retryable_reads/{gridfs-downloadByName-serverErrors.yml → legacy/gridfs-downloadByName-serverErrors.yml} +0 -0
  587. /data/spec/spec_tests/data/retryable_reads/{gridfs-downloadByName.yml → legacy/gridfs-downloadByName.yml} +0 -0
  588. /data/spec/spec_tests/data/retryable_reads/{listCollectionNames-serverErrors.yml → legacy/listCollectionNames-serverErrors.yml} +0 -0
  589. /data/spec/spec_tests/data/retryable_reads/{listCollectionNames.yml → legacy/listCollectionNames.yml} +0 -0
  590. /data/spec/spec_tests/data/retryable_reads/{listCollectionObjects-serverErrors.yml → legacy/listCollectionObjects-serverErrors.yml} +0 -0
  591. /data/spec/spec_tests/data/retryable_reads/{listCollectionObjects.yml → legacy/listCollectionObjects.yml} +0 -0
  592. /data/spec/spec_tests/data/retryable_reads/{listCollections-serverErrors.yml → legacy/listCollections-serverErrors.yml} +0 -0
  593. /data/spec/spec_tests/data/retryable_reads/{listCollections.yml → legacy/listCollections.yml} +0 -0
  594. /data/spec/spec_tests/data/retryable_reads/{listDatabaseNames-serverErrors.yml → legacy/listDatabaseNames-serverErrors.yml} +0 -0
  595. /data/spec/spec_tests/data/retryable_reads/{listDatabaseNames.yml → legacy/listDatabaseNames.yml} +0 -0
  596. /data/spec/spec_tests/data/retryable_reads/{listDatabaseObjects-serverErrors.yml → legacy/listDatabaseObjects-serverErrors.yml} +0 -0
  597. /data/spec/spec_tests/data/retryable_reads/{listDatabaseObjects.yml → legacy/listDatabaseObjects.yml} +0 -0
  598. /data/spec/spec_tests/data/retryable_reads/{listDatabases-serverErrors.yml → legacy/listDatabases-serverErrors.yml} +0 -0
  599. /data/spec/spec_tests/data/retryable_reads/{listDatabases.yml → legacy/listDatabases.yml} +0 -0
  600. /data/spec/spec_tests/data/retryable_reads/{listIndexNames-serverErrors.yml → legacy/listIndexNames-serverErrors.yml} +0 -0
  601. /data/spec/spec_tests/data/retryable_reads/{listIndexNames.yml → legacy/listIndexNames.yml} +0 -0
  602. /data/spec/spec_tests/data/retryable_reads/{listIndexes-serverErrors.yml → legacy/listIndexes-serverErrors.yml} +0 -0
  603. /data/spec/spec_tests/data/retryable_reads/{listIndexes.yml → legacy/listIndexes.yml} +0 -0
  604. /data/spec/spec_tests/data/retryable_reads/{mapReduce.yml → legacy/mapReduce.yml} +0 -0
  605. /data/spec/spec_tests/data/retryable_writes/{bulkWrite-errorLabels.yml → legacy/bulkWrite-errorLabels.yml} +0 -0
  606. /data/spec/spec_tests/data/retryable_writes/{bulkWrite.yml → legacy/bulkWrite.yml} +0 -0
  607. /data/spec/spec_tests/data/retryable_writes/{deleteMany.yml → legacy/deleteMany.yml} +0 -0
  608. /data/spec/spec_tests/data/retryable_writes/{deleteOne-errorLabels.yml → legacy/deleteOne-errorLabels.yml} +0 -0
  609. /data/spec/spec_tests/data/retryable_writes/{deleteOne.yml → legacy/deleteOne.yml} +0 -0
  610. /data/spec/spec_tests/data/retryable_writes/{findOneAndDelete-errorLabels.yml → legacy/findOneAndDelete-errorLabels.yml} +0 -0
  611. /data/spec/spec_tests/data/retryable_writes/{findOneAndDelete.yml → legacy/findOneAndDelete.yml} +0 -0
  612. /data/spec/spec_tests/data/retryable_writes/{findOneAndReplace-errorLabels.yml → legacy/findOneAndReplace-errorLabels.yml} +0 -0
  613. /data/spec/spec_tests/data/retryable_writes/{findOneAndReplace.yml → legacy/findOneAndReplace.yml} +0 -0
  614. /data/spec/spec_tests/data/retryable_writes/{findOneAndUpdate-errorLabels.yml → legacy/findOneAndUpdate-errorLabels.yml} +0 -0
  615. /data/spec/spec_tests/data/retryable_writes/{findOneAndUpdate.yml → legacy/findOneAndUpdate.yml} +0 -0
  616. /data/spec/spec_tests/data/retryable_writes/{insertMany-errorLabels.yml → legacy/insertMany-errorLabels.yml} +0 -0
  617. /data/spec/spec_tests/data/retryable_writes/{insertMany.yml → legacy/insertMany.yml} +0 -0
  618. /data/spec/spec_tests/data/retryable_writes/{insertOne-errorLabels.yml → legacy/insertOne-errorLabels.yml} +0 -0
  619. /data/spec/spec_tests/data/retryable_writes/{insertOne.yml → legacy/insertOne.yml} +0 -0
  620. /data/spec/spec_tests/data/retryable_writes/{replaceOne-errorLabels.yml → legacy/replaceOne-errorLabels.yml} +0 -0
  621. /data/spec/spec_tests/data/retryable_writes/{replaceOne.yml → legacy/replaceOne.yml} +0 -0
  622. /data/spec/spec_tests/data/retryable_writes/{updateMany.yml → legacy/updateMany.yml} +0 -0
  623. /data/spec/spec_tests/data/retryable_writes/{updateOne-errorLabels.yml → legacy/updateOne-errorLabels.yml} +0 -0
  624. /data/spec/spec_tests/data/retryable_writes/{updateOne.yml → legacy/updateOne.yml} +0 -0
@@ -15,7 +15,7 @@ describe 'Client-Side Encryption' do
15
15
 
16
16
  let(:key_vault_client) do
17
17
  client.with(
18
- database: 'admin',
18
+ database: 'keyvault',
19
19
  write_concern: { w: :majority }
20
20
  )['datakeys']
21
21
  end
@@ -23,6 +23,9 @@ describe 'Client-Side Encryption' do
23
23
  let(:test_schema_map) { BSON::ExtJSON.parse(File.read('spec/support/crypt/corpus/corpus-schema.json')) }
24
24
  let(:local_data_key) { BSON::ExtJSON.parse(File.read('spec/support/crypt/corpus/corpus-key-local.json')) }
25
25
  let(:aws_data_key) { BSON::ExtJSON.parse(File.read('spec/support/crypt/corpus/corpus-key-aws.json')) }
26
+ let(:azure_data_key) { BSON::ExtJSON.parse(File.read('spec/support/crypt/corpus/corpus-key-azure.json')) }
27
+ let(:gcp_data_key) { BSON::ExtJSON.parse(File.read('spec/support/crypt/corpus/corpus-key-gcp.json')) }
28
+ let(:kmip_data_key) { BSON::ExtJSON.parse(File.read('spec/support/crypt/corpus/corpus-key-kmip.json')) }
26
29
 
27
30
  let(:client_encrypted) do
28
31
  new_local_client(
@@ -35,8 +38,27 @@ describe 'Client-Side Encryption' do
35
38
  access_key_id: SpecConfig.instance.fle_aws_key,
36
39
  secret_access_key: SpecConfig.instance.fle_aws_secret,
37
40
  },
41
+ azure: {
42
+ tenant_id: SpecConfig.instance.fle_azure_tenant_id,
43
+ client_id: SpecConfig.instance.fle_azure_client_id,
44
+ client_secret: SpecConfig.instance.fle_azure_client_secret,
45
+ },
46
+ gcp: {
47
+ email: SpecConfig.instance.fle_gcp_email,
48
+ private_key: SpecConfig.instance.fle_gcp_private_key,
49
+ },
50
+ kmip: {
51
+ endpoint: SpecConfig.instance.fle_kmip_endpoint,
52
+ }
53
+ },
54
+ kms_tls_options: {
55
+ kmip: {
56
+ ssl_ca_cert: SpecConfig.instance.fle_kmip_tls_ca_file,
57
+ ssl_cert: SpecConfig.instance.fle_kmip_tls_certificate_key_file,
58
+ ssl_key: SpecConfig.instance.fle_kmip_tls_certificate_key_file,
59
+ }
38
60
  },
39
- key_vault_namespace: 'admin.datakeys',
61
+ key_vault_namespace: 'keyvault.datakeys',
40
62
  schema_map: local_schema_map,
41
63
  # Spawn mongocryptd on non-default port for sharded cluster tests
42
64
  extra_options: extra_options,
@@ -55,9 +77,28 @@ describe 'Client-Side Encryption' do
55
77
  aws: {
56
78
  access_key_id: SpecConfig.instance.fle_aws_key,
57
79
  secret_access_key: SpecConfig.instance.fle_aws_secret,
80
+ },
81
+ azure: {
82
+ tenant_id: SpecConfig.instance.fle_azure_tenant_id,
83
+ client_id: SpecConfig.instance.fle_azure_client_id,
84
+ client_secret: SpecConfig.instance.fle_azure_client_secret,
85
+ },
86
+ gcp: {
87
+ email: SpecConfig.instance.fle_gcp_email,
88
+ private_key: SpecConfig.instance.fle_gcp_private_key,
89
+ },
90
+ kmip: {
91
+ endpoint: SpecConfig.instance.fle_kmip_endpoint,
92
+ }
93
+ },
94
+ kms_tls_options: {
95
+ kmip: {
96
+ ssl_ca_cert: SpecConfig.instance.fle_kmip_tls_ca_file,
97
+ ssl_cert: SpecConfig.instance.fle_kmip_tls_certificate_key_file,
98
+ ssl_key: SpecConfig.instance.fle_kmip_tls_certificate_key_file,
58
99
  }
59
100
  },
60
- key_vault_namespace: 'admin.datakeys',
101
+ key_vault_namespace: 'keyvault.datakeys',
61
102
  },
62
103
  )
63
104
  end
@@ -67,7 +108,7 @@ describe 'Client-Side Encryption' do
67
108
  end
68
109
 
69
110
  let(:corpus_encrypted_expected) do
70
- BSON::ExtJSON.parse(File.read('spec/support/crypt/corpus/corpus_encrypted.json'))
111
+ BSON::ExtJSON.parse(File.read('spec/support/crypt/corpus/corpus-encrypted.json'))
71
112
  end
72
113
 
73
114
  let(:corpus_copied) do
@@ -78,7 +119,7 @@ describe 'Client-Side Encryption' do
78
119
  # to encrypt that value.
79
120
  corpus_copied = BSON::Document.new
80
121
  corpus.each do |key, doc|
81
- if ['_id', 'altname_aws', 'altname_local'].include?(key)
122
+ if ['_id', 'altname_aws', 'altname_azure', 'altname_gcp', 'altname_kmip', 'altname_local'].include?(key)
82
123
  corpus_copied[key] = doc
83
124
  next
84
125
  end
@@ -89,8 +130,14 @@ describe 'Client-Side Encryption' do
89
130
  options = if doc['identifier'] == 'id'
90
131
  key_id = if doc['kms'] == 'local'
91
132
  'LOCALAAAAAAAAAAAAAAAAA=='
92
- else
133
+ elsif doc['kms'] == 'azure'
134
+ 'AZUREAAAAAAAAAAAAAAAAA=='
135
+ elsif doc['kms'] == 'gcp'
136
+ 'GCPAAAAAAAAAAAAAAAAAAA=='
137
+ elsif doc['kms'] == 'aws'
93
138
  'AWSAAAAAAAAAAAAAAAAAAA=='
139
+ elsif doc['kms'] == 'kmip'
140
+ 'KMIPAAAAAAAAAAAAAAAAAA=='
94
141
  end
95
142
 
96
143
  { key_id: BSON::Binary.new(Base64.decode64(key_id), :uuid) }
@@ -117,7 +164,7 @@ describe 'Client-Side Encryption' do
117
164
  # If doc['allowed'] is false, this error was expected and the value
118
165
  # should be copied over without being encrypted.
119
166
  if doc['allowed']
120
- raise "Unexpected error occured in client-side encryption " +
167
+ raise "Unexpected error occurred in client-side encryption " +
121
168
  "corpus tests: #{e.class}: #{e.message}"
122
169
  end
123
170
 
@@ -132,10 +179,13 @@ describe 'Client-Side Encryption' do
132
179
  before do
133
180
  client.use('db')['coll'].drop
134
181
 
135
- key_vault_collection = client.use('admin')['datakeys', write_concern: { w: :majority }]
182
+ key_vault_collection = client.use('keyvault')['datakeys', write_concern: { w: :majority }]
136
183
  key_vault_collection.drop
137
184
  key_vault_collection.insert_one(local_data_key)
138
185
  key_vault_collection.insert_one(aws_data_key)
186
+ key_vault_collection.insert_one(azure_data_key)
187
+ key_vault_collection.insert_one(gcp_data_key)
188
+ key_vault_collection.insert_one(kmip_data_key)
139
189
  end
140
190
 
141
191
  shared_context 'with jsonSchema collection validator' do
@@ -178,9 +228,6 @@ describe 'Client-Side Encryption' do
178
228
  .find(_id: corpus_encrypted_id)
179
229
  .first
180
230
 
181
- # Check that the actual encrypted document matches the expected
182
- # encrypted document.
183
- expect(corpus_encrypted_actual.keys).to eq(corpus_encrypted_expected.keys)
184
231
 
185
232
  corpus_encrypted_actual.each do |key, value|
186
233
  # If it was deterministically encrypted, test the encrypted values
@@ -205,32 +252,14 @@ describe 'Client-Side Encryption' do
205
252
  end
206
253
  end
207
254
 
208
- context 'with local KMS provider' do
209
- include_context 'with local kms_providers'
210
-
211
- context 'with collection validator' do
212
- include_context 'with jsonSchema collection validator'
213
- it_behaves_like 'a functioning encrypter'
214
- end
215
-
216
- context 'with schema map' do
217
- include_context 'with local schema map'
218
- it_behaves_like 'a functioning encrypter'
219
- end
255
+ context 'with collection validator' do
256
+ include_context 'with jsonSchema collection validator'
257
+ it_behaves_like 'a functioning encrypter'
220
258
  end
221
259
 
222
- context 'with AWS KMS provider' do
223
- include_context 'with AWS kms_providers'
224
-
225
- context 'with collection validator' do
226
- include_context 'with jsonSchema collection validator'
227
- it_behaves_like 'a functioning encrypter'
228
- end
229
-
230
- context 'with schema map' do
231
- include_context 'with local schema map'
232
- it_behaves_like 'a functioning encrypter'
233
- end
260
+ context 'with schema map' do
261
+ include_context 'with local schema map'
262
+ it_behaves_like 'a functioning encrypter'
234
263
  end
235
264
  end
236
265
  end
@@ -23,11 +23,18 @@ describe 'Client-Side Encryption' do
23
23
  client,
24
24
  {
25
25
  kms_providers: aws_kms_providers,
26
- key_vault_namespace: 'admin.datakeys',
26
+ key_vault_namespace: 'keyvault.datakeys',
27
27
  },
28
28
  )
29
29
  end
30
30
 
31
+ let(:master_key_template) do
32
+ {
33
+ region: "us-east-1",
34
+ key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
35
+ }
36
+ end
37
+
31
38
  let(:data_key_id) do
32
39
  client_encryption.create_data_key('aws', master_key: master_key)
33
40
  end
@@ -51,10 +58,7 @@ describe 'Client-Side Encryption' do
51
58
 
52
59
  context 'with region and key options' do
53
60
  let(:master_key) do
54
- {
55
- region: "us-east-1",
56
- key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
57
- }
61
+ master_key_template
58
62
  end
59
63
 
60
64
  it_behaves_like 'a functioning data key'
@@ -62,11 +66,7 @@ describe 'Client-Side Encryption' do
62
66
 
63
67
  context 'with region, key, and endpoint options' do
64
68
  let(:master_key) do
65
- {
66
- region: "us-east-1",
67
- key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
68
- endpoint: "kms.us-east-1.amazonaws.com"
69
- }
69
+ master_key_template.merge({endpoint: "kms.us-east-1.amazonaws.com"})
70
70
  end
71
71
 
72
72
  it_behaves_like 'a functioning data key'
@@ -74,62 +74,59 @@ describe 'Client-Side Encryption' do
74
74
 
75
75
  context 'with region, key, and endpoint with valid port' do
76
76
  let(:master_key) do
77
- {
78
- region: "us-east-1",
79
- key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
80
- endpoint: "kms.us-east-1.amazonaws.com:443"
81
- }
77
+ master_key_template.merge({endpoint: "kms.us-east-1.amazonaws.com:443"})
82
78
  end
83
79
 
84
80
  it_behaves_like 'a functioning data key'
85
81
  end
86
82
 
83
+ shared_examples 'raising a KMS error' do
84
+ it 'throws an exception' do
85
+ expect do
86
+ data_key_id
87
+ end.to raise_error(Mongo::Error::KmsError, error_regex)
88
+ end
89
+ end
90
+
87
91
  context 'with region, key, and endpoint with invalid port' do
88
92
  let(:master_key) do
89
- {
90
- region: "us-east-1",
91
- key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
92
- endpoint: "kms.us-east-1.amazonaws.com:12345"
93
- }
93
+ master_key_template.merge({endpoint: "kms.us-east-1.amazonaws.com:12345"})
94
94
  end
95
95
 
96
- it 'throws an exception' do
97
- expect do
98
- data_key_id
99
- end.to raise_error(Mongo::Error::KmsError, /Connection refused/)
96
+ let(:error_regex) do
97
+ if BSON::Environment.jruby?
98
+ /SocketError/
99
+ else
100
+ /Connection refused/
101
+ end
100
102
  end
103
+
104
+ it_behaves_like 'raising a KMS error'
101
105
  end
102
106
 
107
+
103
108
  context 'with region, key, and endpoint with invalid region' do
104
109
  let(:master_key) do
105
- {
106
- region: "us-east-1",
107
- key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
108
- endpoint: "kms.us-east-2.amazonaws.com"
109
- }
110
+ master_key_template.merge({endpoint: "kms.us-east-2.amazonaws.com"})
110
111
  end
111
112
 
112
- it 'throws an exception' do
113
- expect do
114
- data_key_id
115
- end.to raise_error(Mongo::Error::KmsError, /us-east-1/)
113
+ let(:error_regex) do
114
+ //
116
115
  end
116
+
117
+ it_behaves_like 'raising a KMS error'
117
118
  end
118
119
 
119
120
  context 'with region, key, and endpoint at incorrect domain' do
120
121
  let(:master_key) do
121
- {
122
- region: "us-east-1",
123
- key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
124
- endpoint: "example.com"
125
- }
122
+ master_key_template.merge({endpoint: "example.com"})
126
123
  end
127
124
 
128
- it 'throws an exception' do
129
- expect do
130
- data_key_id
131
- end.to raise_error(Mongo::Error::KmsError, /parse error/)
125
+ let(:error_regex) do
126
+ /parse error/
132
127
  end
128
+
129
+ it_behaves_like 'raising a KMS error'
133
130
  end
134
131
  end
135
132
  end
@@ -50,8 +50,27 @@ describe 'Client-Side Encryption' do
50
50
  access_key_id: SpecConfig.instance.fle_aws_key,
51
51
  secret_access_key: SpecConfig.instance.fle_aws_secret,
52
52
  },
53
+ azure: {
54
+ tenant_id: SpecConfig.instance.fle_azure_tenant_id,
55
+ client_id: SpecConfig.instance.fle_azure_client_id,
56
+ client_secret: SpecConfig.instance.fle_azure_client_secret,
57
+ },
58
+ gcp: {
59
+ email: SpecConfig.instance.fle_gcp_email,
60
+ private_key: SpecConfig.instance.fle_gcp_private_key,
61
+ },
62
+ kmip: {
63
+ endpoint: SpecConfig.instance.fle_kmip_endpoint
64
+ }
53
65
  },
54
- key_vault_namespace: 'admin.datakeys',
66
+ kms_tls_options: {
67
+ kmip: {
68
+ ssl_ca_cert: SpecConfig.instance.fle_kmip_tls_ca_file,
69
+ ssl_cert: SpecConfig.instance.fle_kmip_tls_certificate_key_file,
70
+ ssl_key: SpecConfig.instance.fle_kmip_tls_certificate_key_file,
71
+ }
72
+ },
73
+ key_vault_namespace: 'keyvault.datakeys',
55
74
  schema_map: test_schema_map,
56
75
  # Spawn mongocryptd on non-default port for sharded cluster tests
57
76
  extra_options: extra_options,
@@ -70,15 +89,34 @@ describe 'Client-Side Encryption' do
70
89
  aws: {
71
90
  access_key_id: SpecConfig.instance.fle_aws_key,
72
91
  secret_access_key: SpecConfig.instance.fle_aws_secret,
92
+ },
93
+ azure: {
94
+ tenant_id: SpecConfig.instance.fle_azure_tenant_id,
95
+ client_id: SpecConfig.instance.fle_azure_client_id,
96
+ client_secret: SpecConfig.instance.fle_azure_client_secret,
97
+ },
98
+ gcp: {
99
+ email: SpecConfig.instance.fle_gcp_email,
100
+ private_key: SpecConfig.instance.fle_gcp_private_key,
101
+ },
102
+ kmip: {
103
+ endpoint: SpecConfig.instance.fle_kmip_endpoint
73
104
  }
74
105
  },
75
- key_vault_namespace: 'admin.datakeys',
106
+ kms_tls_options: {
107
+ kmip: {
108
+ ssl_ca_cert: SpecConfig.instance.fle_kmip_tls_ca_file,
109
+ ssl_cert: SpecConfig.instance.fle_kmip_tls_certificate_key_file,
110
+ ssl_key: SpecConfig.instance.fle_kmip_tls_certificate_key_file,
111
+ }
112
+ },
113
+ key_vault_namespace: 'keyvault.datakeys',
76
114
  },
77
115
  )
78
116
  end
79
117
 
80
118
  before do
81
- client.use('admin')['datakeys'].drop
119
+ client.use('keyvault')['datakeys'].drop
82
120
  client.use('db')['coll'].drop
83
121
  end
84
122
 
@@ -91,7 +129,7 @@ describe 'Client-Side Encryption' do
91
129
 
92
130
  expect(data_key_id).to be_uuid
93
131
 
94
- keys = client.use('admin')['datakeys'].find(_id: data_key_id)
132
+ keys = client.use('keyvault')['datakeys'].find(_id: data_key_id)
95
133
 
96
134
  expect(keys.count).to eq(1)
97
135
  expect(keys.first['masterKey']['provider']).to eq(kms_provider_name)
@@ -134,7 +172,7 @@ describe 'Client-Side Encryption' do
134
172
 
135
173
  expect do
136
174
  client_encrypted['coll'].insert_one(encrypted_placeholder: encrypted)
137
- end.to raise_error(Mongo::Error::OperationFailure, /Cannot encrypt element of type binData/)
175
+ end.to raise_error(Mongo::Error::OperationFailure, /Cannot encrypt element of type(: encrypted binary data| binData)/)
138
176
  end
139
177
  end
140
178
 
@@ -156,8 +194,60 @@ describe 'Client-Side Encryption' do
156
194
  let(:data_key_options) do
157
195
  {
158
196
  master_key: {
159
- region: "us-east-1",
160
- key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
197
+ region: SpecConfig.instance.fle_aws_region,
198
+ key: SpecConfig.instance.fle_aws_arn,
199
+ }
200
+ }
201
+ end
202
+
203
+ it_behaves_like 'can create and use a data key'
204
+ end
205
+
206
+ context 'with Azure KMS options' do
207
+ include_context 'with Azure kms_providers'
208
+
209
+ let(:key_alt_name) { 'azure_altname' }
210
+ let(:value_to_encrypt) { 'hello azure' }
211
+ let(:data_key_options) do
212
+ {
213
+ master_key: {
214
+ key_vault_endpoint: SpecConfig.instance.fle_azure_key_vault_endpoint,
215
+ key_name: SpecConfig.instance.fle_azure_key_name,
216
+ }
217
+ }
218
+ end
219
+
220
+ it_behaves_like 'can create and use a data key'
221
+ end
222
+
223
+ context 'with GCP KMS options' do
224
+ include_context 'with GCP kms_providers'
225
+
226
+ let(:key_alt_name) { 'gcp_altname' }
227
+ let(:value_to_encrypt) { 'hello gcp' }
228
+ let(:data_key_options) do
229
+ {
230
+ master_key: {
231
+ project_id: SpecConfig.instance.fle_gcp_project_id,
232
+ location: SpecConfig.instance.fle_gcp_location,
233
+ key_ring: SpecConfig.instance.fle_gcp_key_ring,
234
+ key_name: SpecConfig.instance.fle_gcp_key_name,
235
+ }
236
+ }
237
+ end
238
+
239
+ it_behaves_like 'can create and use a data key'
240
+ end
241
+
242
+ context 'with KMIP KMS options' do
243
+ include_context 'with KMIP kms_providers'
244
+
245
+ let(:key_alt_name) { 'kmip_altname' }
246
+ let(:value_to_encrypt) { 'hello kmip' }
247
+ let(:data_key_options) do
248
+ {
249
+ master_key: {
250
+ key_id: "1"
161
251
  }
162
252
  }
163
253
  end
@@ -12,6 +12,7 @@ describe 'Explicit Encryption' do
12
12
  let(:client_encryption_opts) do
13
13
  {
14
14
  kms_providers: kms_providers,
15
+ kms_tls_options: kms_tls_options,
15
16
  key_vault_namespace: key_vault_namespace
16
17
  }
17
18
  end
@@ -72,6 +73,28 @@ describe 'Explicit Encryption' do
72
73
 
73
74
  context 'with AWS KMS provider' do
74
75
  include_context 'with AWS kms_providers'
76
+ retry_test
77
+
78
+ it_behaves_like 'an explicit encrypter'
79
+ end
80
+
81
+ context 'with Azure KMS provider' do
82
+ include_context 'with Azure kms_providers'
83
+ retry_test
84
+
85
+ it_behaves_like 'an explicit encrypter'
86
+ end
87
+
88
+ context 'with GCP KMS provider' do
89
+ include_context 'with GCP kms_providers'
90
+ retry_test
91
+
92
+ it_behaves_like 'an explicit encrypter'
93
+ end
94
+
95
+ context 'with KMIP KMS provider' do
96
+ include_context 'with KMIP kms_providers'
97
+ retry_test
75
98
 
76
99
  it_behaves_like 'an explicit encrypter'
77
100
  end
@@ -92,6 +115,24 @@ describe 'Explicit Encryption' do
92
115
  it_behaves_like 'an explicit encrypter'
93
116
  end
94
117
 
118
+ context 'with Azure KMS provider' do
119
+ include_context 'with Azure kms_providers'
120
+
121
+ it_behaves_like 'an explicit encrypter'
122
+ end
123
+
124
+ context 'with GCP KMS provider' do
125
+ include_context 'with GCP kms_providers'
126
+
127
+ it_behaves_like 'an explicit encrypter'
128
+ end
129
+
130
+ context 'with KMIP KMS provider' do
131
+ include_context 'with KMIP kms_providers'
132
+
133
+ it_behaves_like 'an explicit encrypter'
134
+ end
135
+
95
136
  context 'with local KMS provider' do
96
137
  include_context 'with local kms_providers'
97
138
 
@@ -108,6 +149,24 @@ describe 'Explicit Encryption' do
108
149
  it_behaves_like 'an explicit encrypter'
109
150
  end
110
151
 
152
+ context 'with Azure KMS provider' do
153
+ include_context 'with Azure kms_providers'
154
+
155
+ it_behaves_like 'an explicit encrypter'
156
+ end
157
+
158
+ context 'with GCP KMS provider' do
159
+ include_context 'with GCP kms_providers'
160
+
161
+ it_behaves_like 'an explicit encrypter'
162
+ end
163
+
164
+ context 'with KMIP KMS provider' do
165
+ include_context 'with KMIP kms_providers'
166
+
167
+ it_behaves_like 'an explicit encrypter'
168
+ end
169
+
111
170
  context 'with local KMS provider' do
112
171
  include_context 'with local kms_providers'
113
172
 
@@ -0,0 +1,147 @@
1
+ # frozen_string_literal: true
2
+ # encoding: utf-8
3
+
4
+ require 'spec_helper'
5
+
6
+ describe 'Explicit Queryable Encryption' do
7
+ require_libmongocrypt
8
+ min_server_version '6.0.0-rc8'
9
+ require_topology :replica_set, :sharded, :load_balanced
10
+
11
+ include_context 'define shared FLE helpers'
12
+
13
+ let(:key1_id) do
14
+ key1_document['_id']
15
+ end
16
+
17
+ let(:encrypted_coll) do
18
+ 'explicit_encryption'
19
+ end
20
+
21
+ let(:value) do
22
+ "encrypted indexed value"
23
+ end
24
+
25
+ let(:unindexed_value) do
26
+ "encrypted unindexed value"
27
+ end
28
+
29
+ let(:key_vault_client) do
30
+ ClientRegistry.instance.new_local_client(SpecConfig.instance.addresses)
31
+ end
32
+
33
+ let(:client_encryption_opts) do
34
+ {
35
+ kms_providers: local_kms_providers,
36
+ kms_tls_options: kms_tls_options,
37
+ key_vault_namespace: key_vault_namespace
38
+ }
39
+ end
40
+
41
+ let(:client_encryption) do
42
+ Mongo::ClientEncryption.new(
43
+ key_vault_client,
44
+ client_encryption_opts
45
+ )
46
+ end
47
+
48
+ let(:encrypted_client) do
49
+ ClientRegistry.instance.new_local_client(
50
+ SpecConfig.instance.addresses,
51
+ auto_encryption_options: {
52
+ key_vault_namespace: "#{key_vault_db}.#{key_vault_coll}",
53
+ kms_providers: local_kms_providers,
54
+ bypass_query_analysis: true
55
+ },
56
+ database: SpecConfig.instance.test_db
57
+ )
58
+ end
59
+
60
+ before(:each) do
61
+ authorized_client[encrypted_coll].drop(encrypted_fields: encrypted_fields)
62
+ authorized_client[encrypted_coll].create(encrypted_fields: encrypted_fields)
63
+ authorized_client.use(key_vault_db)[key_vault_coll].drop
64
+ authorized_client.use(key_vault_db)[key_vault_coll, write_concern: {w: :majority}].insert_one(key1_document)
65
+ end
66
+
67
+ after(:each) do
68
+ authorized_client[encrypted_coll].drop(encrypted_fields: encrypted_fields)
69
+ authorized_client.use(key_vault_db)[key_vault_coll].drop
70
+ end
71
+
72
+ it 'can insert encrypted indexed and find' do
73
+ insert_payload = client_encryption.encrypt(
74
+ value, key_id: key1_id, algorithm: "Indexed"
75
+ )
76
+ encrypted_client[encrypted_coll].insert_one(
77
+ "encryptedIndexed" => insert_payload
78
+ )
79
+ find_payload = client_encryption.encrypt(
80
+ value, key_id: key1_id, algorithm: "Indexed", query_type: :equality
81
+ )
82
+ find_results = encrypted_client[encrypted_coll]
83
+ .find("encryptedIndexed" => find_payload)
84
+ .to_a
85
+ expect(find_results.size).to eq(1)
86
+ expect(find_results.first["encryptedIndexed"]).to eq(value)
87
+ end
88
+
89
+ it 'can insert encrypted indexed and find with non-zero contention' do
90
+ 10.times do
91
+ insert_payload = client_encryption.encrypt(
92
+ value, key_id: key1_id, algorithm: "Indexed", contention_factor: 10
93
+ )
94
+ encrypted_client[encrypted_coll].insert_one(
95
+ "encryptedIndexed" => insert_payload
96
+ )
97
+ end
98
+ find_payload = client_encryption.encrypt(
99
+ value, key_id: key1_id, algorithm: "Indexed", query_type: :equality
100
+ )
101
+ find_results = encrypted_client[encrypted_coll]
102
+ .find("encryptedIndexed" => find_payload)
103
+ .to_a
104
+ expect(find_results.size).to be < 10
105
+ find_results.each do |doc|
106
+ expect(doc["encryptedIndexed"]).to eq(value)
107
+ end
108
+ find_payload_2 = client_encryption.encrypt(
109
+ value, key_id: key1_id, algorithm: "Indexed", query_type: :equality, contention_factor: 10
110
+ )
111
+ find_results_2 = encrypted_client[encrypted_coll]
112
+ .find("encryptedIndexed" => find_payload_2)
113
+ .to_a
114
+ expect(find_results_2.size).to eq(10)
115
+ find_results_2.each do |doc|
116
+ expect(doc["encryptedIndexed"]).to eq(value)
117
+ end
118
+ end
119
+
120
+ it 'can insert encrypted unindexed' do
121
+ insert_payload = client_encryption.encrypt(
122
+ unindexed_value, key_id: key1_id, algorithm: "Unindexed"
123
+ )
124
+ encrypted_client[encrypted_coll].insert_one(
125
+ "_id" => 1, "encryptedUnindexed" => insert_payload
126
+ )
127
+ find_results = encrypted_client[encrypted_coll].find("_id" => 1).to_a
128
+ expect(find_results.size).to eq(1)
129
+ expect(find_results.first["encryptedUnindexed"]).to eq(unindexed_value)
130
+ end
131
+
132
+ it 'can roundtrip encrypted indexed' do
133
+ payload = client_encryption.encrypt(
134
+ value, key_id: key1_id, algorithm: "Indexed"
135
+ )
136
+ decrypted_value = client_encryption.decrypt(payload)
137
+ expect(decrypted_value).to eq(value)
138
+ end
139
+
140
+ it 'can roundtrip encrypted unindexed' do
141
+ payload = client_encryption.encrypt(
142
+ unindexed_value, key_id: key1_id, algorithm: "Unindexed"
143
+ )
144
+ decrypted_value = client_encryption.decrypt(payload)
145
+ expect(decrypted_value).to eq(unindexed_value)
146
+ end
147
+ end