mongo 2.15.0 → 2.18.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (920) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/README.md +22 -38
  4. data/lib/mongo/auth/aws/request.rb +0 -1
  5. data/lib/mongo/auth/base.rb +8 -1
  6. data/lib/mongo/auth.rb +12 -1
  7. data/lib/mongo/bulk_write/result.rb +10 -1
  8. data/lib/mongo/bulk_write/result_combiner.rb +2 -4
  9. data/lib/mongo/bulk_write.rb +115 -29
  10. data/lib/mongo/client.rb +182 -22
  11. data/lib/mongo/client_encryption.rb +113 -10
  12. data/lib/mongo/cluster/periodic_executor.rb +4 -3
  13. data/lib/mongo/cluster/reapers/cursor_reaper.rb +98 -43
  14. data/lib/mongo/cluster/sdam_flow.rb +9 -3
  15. data/lib/mongo/cluster/topology/base.rb +13 -9
  16. data/lib/mongo/cluster/topology/load_balanced.rb +102 -0
  17. data/lib/mongo/cluster/topology.rb +28 -8
  18. data/lib/mongo/cluster.rb +162 -79
  19. data/lib/mongo/collection/helpers.rb +43 -0
  20. data/lib/mongo/collection/queryable_encryption.rb +122 -0
  21. data/lib/mongo/collection/view/aggregation.rb +68 -22
  22. data/lib/mongo/collection/view/builder/aggregation.rb +16 -17
  23. data/lib/mongo/collection/view/builder/map_reduce.rb +15 -49
  24. data/lib/mongo/collection/view/builder.rb +0 -4
  25. data/lib/mongo/collection/view/change_stream.rb +66 -20
  26. data/lib/mongo/collection/view/explainable.rb +1 -1
  27. data/lib/mongo/collection/view/iterable.rb +64 -30
  28. data/lib/mongo/collection/view/map_reduce.rb +72 -24
  29. data/lib/mongo/collection/view/readable.rb +106 -70
  30. data/lib/mongo/collection/view/writable.rb +296 -177
  31. data/lib/mongo/collection/view.rb +15 -21
  32. data/lib/mongo/collection.rb +141 -53
  33. data/lib/mongo/config/options.rb +62 -0
  34. data/lib/mongo/config/validators/option.rb +26 -0
  35. data/lib/mongo/config.rb +42 -0
  36. data/lib/mongo/crypt/auto_encrypter.rb +136 -14
  37. data/lib/mongo/crypt/binding.rb +513 -144
  38. data/lib/mongo/crypt/context.rb +5 -2
  39. data/lib/mongo/crypt/data_key_context.rb +12 -104
  40. data/lib/mongo/crypt/encryption_io.rb +94 -60
  41. data/lib/mongo/crypt/explicit_encrypter.rb +143 -26
  42. data/lib/mongo/crypt/explicit_encryption_context.rb +25 -2
  43. data/lib/mongo/crypt/handle.rb +160 -86
  44. data/lib/mongo/crypt/hooks.rb +25 -2
  45. data/lib/mongo/crypt/kms/aws.rb +136 -0
  46. data/lib/mongo/crypt/kms/azure.rb +144 -0
  47. data/lib/mongo/crypt/kms/credentials.rb +81 -0
  48. data/lib/mongo/crypt/kms/gcp.rb +189 -0
  49. data/lib/mongo/crypt/kms/kmip.rb +116 -0
  50. data/lib/mongo/crypt/kms/local.rb +82 -0
  51. data/lib/mongo/crypt/kms/master_key_document.rb +65 -0
  52. data/lib/mongo/crypt/kms.rb +117 -0
  53. data/lib/mongo/crypt/rewrap_many_data_key_context.rb +46 -0
  54. data/lib/mongo/crypt/rewrap_many_data_key_result.rb +37 -0
  55. data/lib/mongo/crypt/status.rb +8 -2
  56. data/lib/mongo/crypt.rb +3 -0
  57. data/lib/mongo/cursor/kill_spec.rb +76 -0
  58. data/lib/mongo/cursor.rb +92 -36
  59. data/lib/mongo/database/view.rb +11 -6
  60. data/lib/mongo/database.rb +63 -19
  61. data/lib/mongo/dbref.rb +1 -105
  62. data/lib/mongo/error/bad_load_balancer_target.rb +26 -0
  63. data/lib/mongo/error/bulk_write_error.rb +31 -4
  64. data/lib/mongo/error/invalid_config_option.rb +20 -0
  65. data/lib/mongo/error/invalid_replacement_document.rb +27 -9
  66. data/lib/mongo/error/invalid_update_document.rb +27 -7
  67. data/lib/mongo/error/labelable.rb +72 -0
  68. data/lib/mongo/error/missing_connection.rb +25 -0
  69. data/lib/mongo/error/missing_file_chunk.rb +8 -2
  70. data/lib/mongo/error/missing_service_id.rb +26 -0
  71. data/lib/mongo/error/no_service_connection_available.rb +49 -0
  72. data/lib/mongo/error/notable.rb +14 -0
  73. data/lib/mongo/error/operation_failure.rb +34 -86
  74. data/lib/mongo/error/read_write_retryable.rb +108 -0
  75. data/lib/mongo/error/session_not_materialized.rb +29 -0
  76. data/lib/mongo/error/snapshot_session_invalid_server_version.rb +31 -0
  77. data/lib/mongo/error/snapshot_session_transaction_prohibited.rb +30 -0
  78. data/lib/mongo/error.rb +10 -37
  79. data/lib/mongo/grid/fs_bucket.rb +21 -2
  80. data/lib/mongo/grid/stream/read.rb +6 -0
  81. data/lib/mongo/id.rb +7 -5
  82. data/lib/mongo/index/view.rb +45 -48
  83. data/lib/mongo/monitoring/event/cmap/pool_cleared.rb +7 -4
  84. data/lib/mongo/monitoring/event/command_failed.rb +9 -3
  85. data/lib/mongo/monitoring/event/command_started.rb +3 -1
  86. data/lib/mongo/monitoring/event/command_succeeded.rb +9 -2
  87. data/lib/mongo/monitoring/publishable.rb +11 -7
  88. data/lib/mongo/operation/aggregate/command.rb +8 -0
  89. data/lib/mongo/operation/collections_info/result.rb +5 -2
  90. data/lib/mongo/operation/command/op_msg.rb +6 -0
  91. data/lib/mongo/operation/context.rb +37 -1
  92. data/lib/mongo/operation/count/command.rb +6 -0
  93. data/lib/mongo/operation/count/op_msg.rb +9 -0
  94. data/lib/mongo/operation/create/command.rb +7 -1
  95. data/lib/mongo/operation/create/op_msg.rb +10 -0
  96. data/lib/mongo/operation/create_index/command.rb +17 -1
  97. data/lib/mongo/operation/create_index/op_msg.rb +18 -4
  98. data/lib/mongo/operation/delete/command.rb +6 -3
  99. data/lib/mongo/operation/delete/op_msg.rb +10 -1
  100. data/lib/mongo/operation/delete.rb +0 -1
  101. data/lib/mongo/operation/distinct/command.rb +6 -0
  102. data/lib/mongo/operation/distinct/op_msg.rb +10 -0
  103. data/lib/mongo/operation/drop_index/op_msg.rb +5 -1
  104. data/lib/mongo/operation/explain/command.rb +13 -1
  105. data/lib/mongo/operation/explain/legacy.rb +12 -5
  106. data/lib/mongo/operation/explain/op_msg.rb +9 -1
  107. data/lib/mongo/operation/find/builder/command.rb +111 -0
  108. data/lib/mongo/{collection/view → operation/find}/builder/flags.rb +10 -14
  109. data/lib/mongo/operation/find/builder/legacy.rb +123 -0
  110. data/lib/mongo/{collection/view → operation/find}/builder/modifiers.rb +31 -25
  111. data/lib/mongo/{cursor → operation/find}/builder.rb +4 -4
  112. data/lib/mongo/operation/find/command.rb +9 -0
  113. data/lib/mongo/operation/find/legacy.rb +10 -1
  114. data/lib/mongo/operation/find/op_msg.rb +12 -0
  115. data/lib/mongo/operation/find.rb +1 -0
  116. data/lib/mongo/operation/get_more/command.rb +1 -0
  117. data/lib/mongo/operation/get_more/command_builder.rb +42 -0
  118. data/lib/mongo/operation/get_more/op_msg.rb +1 -0
  119. data/lib/mongo/operation/get_more.rb +1 -0
  120. data/lib/mongo/operation/insert/bulk_result.rb +5 -1
  121. data/lib/mongo/operation/insert/command.rb +0 -4
  122. data/lib/mongo/operation/insert/op_msg.rb +6 -3
  123. data/lib/mongo/operation/insert/result.rb +6 -3
  124. data/lib/mongo/operation/insert.rb +0 -1
  125. data/lib/mongo/operation/kill_cursors/command.rb +8 -0
  126. data/lib/mongo/operation/kill_cursors/{legacy.rb → command_builder.rb} +6 -11
  127. data/lib/mongo/operation/kill_cursors/op_msg.rb +10 -0
  128. data/lib/mongo/operation/kill_cursors.rb +1 -1
  129. data/lib/mongo/operation/list_collections/op_msg.rb +4 -1
  130. data/lib/mongo/operation/map_reduce/command.rb +8 -0
  131. data/lib/mongo/operation/map_reduce/op_msg.rb +1 -1
  132. data/lib/mongo/operation/map_reduce/result.rb +16 -0
  133. data/lib/mongo/operation/result.rb +27 -5
  134. data/lib/mongo/operation/shared/executable.rb +36 -3
  135. data/lib/mongo/operation/shared/polymorphic_operation.rb +15 -3
  136. data/lib/mongo/operation/shared/read_preference_supported.rb +3 -1
  137. data/lib/mongo/operation/shared/response_handling.rb +7 -5
  138. data/lib/mongo/operation/shared/sessions_supported.rb +35 -15
  139. data/lib/mongo/operation/shared/specifiable.rb +11 -29
  140. data/lib/mongo/operation/shared/validatable.rb +87 -0
  141. data/lib/mongo/operation/shared/write.rb +18 -12
  142. data/lib/mongo/operation/update/command.rb +6 -3
  143. data/lib/mongo/operation/update/op_msg.rb +9 -4
  144. data/lib/mongo/operation/update.rb +0 -1
  145. data/lib/mongo/operation/{delete/legacy.rb → write_command/command.rb} +17 -23
  146. data/lib/mongo/operation/write_command/op_msg.rb +43 -0
  147. data/lib/mongo/operation/write_command.rb +32 -0
  148. data/lib/mongo/operation.rb +10 -0
  149. data/lib/mongo/protocol/caching_hash.rb +69 -0
  150. data/lib/mongo/protocol/msg.rb +21 -1
  151. data/lib/mongo/protocol/query.rb +35 -18
  152. data/lib/mongo/protocol.rb +1 -0
  153. data/lib/mongo/query_cache.rb +27 -2
  154. data/lib/mongo/retryable.rb +78 -30
  155. data/lib/mongo/server/connection.rb +58 -3
  156. data/lib/mongo/server/connection_base.rb +14 -1
  157. data/lib/mongo/server/connection_common.rb +41 -1
  158. data/lib/mongo/server/connection_pool/generation_manager.rb +71 -0
  159. data/lib/mongo/server/connection_pool.rb +144 -43
  160. data/lib/mongo/server/description/features.rb +22 -17
  161. data/lib/mongo/server/description/load_balancer.rb +33 -0
  162. data/lib/mongo/server/description.rb +90 -6
  163. data/lib/mongo/server/monitor/connection.rb +16 -10
  164. data/lib/mongo/server/monitor.rb +27 -14
  165. data/lib/mongo/server/pending_connection.rb +47 -31
  166. data/lib/mongo/server/push_monitor.rb +21 -2
  167. data/lib/mongo/server.rb +78 -27
  168. data/lib/mongo/server_selector/base.rb +31 -5
  169. data/lib/mongo/session/session_pool.rb +19 -0
  170. data/lib/mongo/session.rb +142 -27
  171. data/lib/mongo/socket/ocsp_cache.rb +2 -3
  172. data/lib/mongo/socket/ocsp_verifier.rb +7 -39
  173. data/lib/mongo/socket/tcp.rb +3 -0
  174. data/lib/mongo/socket.rb +1 -5
  175. data/lib/mongo/srv/resolver.rb +24 -3
  176. data/lib/mongo/uri/options_mapper.rb +3 -0
  177. data/lib/mongo/uri/srv_protocol.rb +7 -9
  178. data/lib/mongo/uri.rb +38 -0
  179. data/lib/mongo/utils.rb +0 -13
  180. data/lib/mongo/version.rb +1 -1
  181. data/lib/mongo.rb +22 -0
  182. data/mongo.gemspec +11 -5
  183. data/spec/README.md +23 -5
  184. data/spec/integration/auth_spec.rb +31 -1
  185. data/spec/integration/awaited_ismaster_spec.rb +1 -1
  186. data/spec/integration/aws_lambda_examples_spec.rb +68 -0
  187. data/spec/integration/bulk_write_error_message_spec.rb +32 -0
  188. data/spec/integration/bulk_write_spec.rb +17 -1
  189. data/spec/integration/change_stream_spec.rb +9 -8
  190. data/spec/integration/client_construction_spec.rb +128 -8
  191. data/spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb +10 -10
  192. data/spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb +169 -169
  193. data/spec/integration/client_side_encryption/auto_encryption_mongocryptd_spawn_spec.rb +0 -1
  194. data/spec/integration/client_side_encryption/auto_encryption_reconnect_spec.rb +31 -0
  195. data/spec/integration/client_side_encryption/auto_encryption_spec.rb +108 -1
  196. data/spec/integration/client_side_encryption/bson_size_limit_spec.rb +3 -3
  197. data/spec/integration/client_side_encryption/bypass_mongocryptd_spawn_spec.rb +2 -2
  198. data/spec/integration/client_side_encryption/client_close_spec.rb +1 -1
  199. data/spec/integration/client_side_encryption/corpus_spec.rb +64 -35
  200. data/spec/integration/client_side_encryption/custom_endpoint_spec.rb +39 -42
  201. data/spec/integration/client_side_encryption/data_key_spec.rb +98 -8
  202. data/spec/integration/client_side_encryption/decryption_events_prose_spec.rb +158 -0
  203. data/spec/integration/client_side_encryption/explicit_encryption_spec.rb +59 -0
  204. data/spec/integration/client_side_encryption/explicit_queryable_encryption_spec.rb +147 -0
  205. data/spec/integration/client_side_encryption/external_key_vault_spec.rb +6 -6
  206. data/spec/integration/client_side_encryption/kms_tls_options_spec.rb +436 -0
  207. data/spec/integration/client_side_encryption/kms_tls_spec.rb +92 -0
  208. data/spec/integration/client_side_encryption/queryable_encryption_examples_spec.rb +111 -0
  209. data/spec/integration/client_side_encryption/unique_index_on_key_alt_names_prose_spec.rb +85 -0
  210. data/spec/integration/client_side_encryption/views_spec.rb +1 -1
  211. data/spec/integration/client_spec.rb +2 -0
  212. data/spec/integration/client_update_spec.rb +2 -2
  213. data/spec/integration/command_monitoring_spec.rb +1 -1
  214. data/spec/integration/command_spec.rb +1 -1
  215. data/spec/integration/connection_spec.rb +52 -35
  216. data/spec/integration/crud_spec.rb +186 -1
  217. data/spec/integration/cursor_pinning_spec.rb +121 -0
  218. data/spec/integration/cursor_reaping_spec.rb +8 -4
  219. data/spec/integration/fork_reconnect_spec.rb +16 -13
  220. data/spec/integration/get_more_spec.rb +1 -1
  221. data/spec/integration/grid_fs_bucket_spec.rb +3 -3
  222. data/spec/integration/heartbeat_events_spec.rb +1 -1
  223. data/spec/integration/map_reduce_spec.rb +77 -0
  224. data/spec/integration/ocsp_verifier_spec.rb +3 -0
  225. data/spec/integration/query_cache_spec.rb +240 -32
  226. data/spec/integration/query_cache_transactions_spec.rb +1 -1
  227. data/spec/integration/read_concern_spec.rb +1 -1
  228. data/spec/integration/read_preference_spec.rb +17 -13
  229. data/spec/integration/reconnect_spec.rb +32 -12
  230. data/spec/integration/retryable_errors_spec.rb +1 -1
  231. data/spec/integration/retryable_writes/retryable_writes_36_and_older_spec.rb +2 -2
  232. data/spec/integration/retryable_writes/retryable_writes_40_and_newer_spec.rb +1 -1
  233. data/spec/integration/sdam_error_handling_spec.rb +5 -3
  234. data/spec/integration/sdam_events_spec.rb +75 -19
  235. data/spec/integration/sdam_prose_spec.rb +1 -1
  236. data/spec/integration/server_monitor_spec.rb +3 -1
  237. data/spec/integration/server_selector_spec.rb +22 -5
  238. data/spec/integration/server_spec.rb +2 -0
  239. data/spec/integration/size_limit_spec.rb +4 -1
  240. data/spec/integration/snapshot_query_examples_spec.rb +127 -0
  241. data/spec/integration/srv_monitoring_spec.rb +39 -1
  242. data/spec/integration/srv_spec.rb +1 -0
  243. data/spec/integration/step_down_spec.rb +21 -5
  244. data/spec/integration/transaction_pinning_spec.rb +120 -0
  245. data/spec/integration/versioned_api_examples_spec.rb +52 -1
  246. data/spec/integration/x509_auth_spec.rb +1 -1
  247. data/spec/lite_spec_helper.rb +27 -11
  248. data/spec/mongo/address/ipv6_spec.rb +7 -0
  249. data/spec/mongo/address/unix_spec.rb +1 -0
  250. data/spec/mongo/address_spec.rb +7 -0
  251. data/spec/mongo/auth/cr_spec.rb +2 -3
  252. data/spec/mongo/auth/ldap_spec.rb +2 -3
  253. data/spec/mongo/auth/scram/conversation_spec.rb +23 -23
  254. data/spec/mongo/auth/scram256/conversation_spec.rb +20 -20
  255. data/spec/mongo/auth/scram_negotiation_spec.rb +1 -0
  256. data/spec/mongo/auth/scram_spec.rb +2 -3
  257. data/spec/mongo/auth/user/view_spec.rb +1 -1
  258. data/spec/mongo/auth/x509_spec.rb +2 -3
  259. data/spec/mongo/bulk_write/result_spec.rb +15 -1
  260. data/spec/mongo/bulk_write_spec.rb +144 -23
  261. data/spec/mongo/client_construction_spec.rb +443 -35
  262. data/spec/mongo/client_encryption_spec.rb +10 -22
  263. data/spec/mongo/client_spec.rb +303 -5
  264. data/spec/mongo/cluster/cursor_reaper_spec.rb +63 -23
  265. data/spec/mongo/cluster/periodic_executor_spec.rb +3 -1
  266. data/spec/mongo/cluster_spec.rb +33 -36
  267. data/spec/mongo/collection/view/aggregation_spec.rb +178 -83
  268. data/spec/mongo/collection/view/builder/find_command_spec.rb +4 -0
  269. data/spec/mongo/collection/view/builder/op_query_spec.rb +4 -0
  270. data/spec/mongo/collection/view/change_stream_spec.rb +2 -2
  271. data/spec/mongo/collection/view/map_reduce_spec.rb +31 -2
  272. data/spec/mongo/collection/view/readable_spec.rb +661 -1
  273. data/spec/mongo/collection/view/writable_spec.rb +144 -32
  274. data/spec/mongo/collection_crud_spec.rb +70 -15
  275. data/spec/mongo/collection_ddl_spec.rb +1 -1
  276. data/spec/mongo/collection_spec.rb +33 -1
  277. data/spec/mongo/config/options_spec.rb +75 -0
  278. data/spec/mongo/config_spec.rb +73 -0
  279. data/spec/mongo/crypt/auto_decryption_context_spec.rb +17 -1
  280. data/spec/mongo/crypt/auto_encrypter_spec.rb +256 -5
  281. data/spec/mongo/crypt/auto_encryption_context_spec.rb +17 -1
  282. data/spec/mongo/crypt/binding/context_spec.rb +67 -17
  283. data/spec/mongo/crypt/binding/mongocrypt_spec.rb +17 -46
  284. data/spec/mongo/crypt/binding/version_spec.rb +33 -0
  285. data/spec/mongo/crypt/binding_unloaded_spec.rb +14 -0
  286. data/spec/mongo/crypt/data_key_context_spec.rb +42 -114
  287. data/spec/mongo/crypt/encryption_io_spec.rb +2 -0
  288. data/spec/mongo/crypt/explicit_decryption_context_spec.rb +32 -1
  289. data/spec/mongo/crypt/explicit_encryption_context_spec.rb +94 -1
  290. data/spec/mongo/crypt/handle_spec.rb +172 -156
  291. data/spec/mongo/crypt/hooks_spec.rb +30 -0
  292. data/spec/mongo/crypt/kms/credentials_spec.rb +357 -0
  293. data/spec/mongo/crypt/kms_spec.rb +59 -0
  294. data/spec/mongo/cursor/builder/get_more_command_spec.rb +4 -0
  295. data/spec/mongo/cursor/builder/op_get_more_spec.rb +4 -0
  296. data/spec/mongo/cursor_spec.rb +104 -7
  297. data/spec/mongo/database_spec.rb +81 -16
  298. data/spec/mongo/error/operation_failure_heavy_spec.rb +50 -1
  299. data/spec/mongo/grid/fs_bucket_spec.rb +18 -12
  300. data/spec/mongo/grid/stream/write_spec.rb +3 -9
  301. data/spec/mongo/grid/stream_spec.rb +1 -1
  302. data/spec/mongo/index/view_spec.rb +127 -2
  303. data/spec/mongo/operation/create/op_msg_spec.rb +244 -0
  304. data/spec/mongo/operation/delete/op_msg_spec.rb +14 -5
  305. data/spec/mongo/operation/delete_spec.rb +0 -30
  306. data/spec/mongo/{collection/view → operation/find}/builder/flags_spec.rb +2 -2
  307. data/spec/mongo/{collection/view → operation/find}/builder/modifiers_spec.rb +2 -2
  308. data/spec/mongo/operation/find/legacy_spec.rb +1 -0
  309. data/spec/mongo/operation/insert/bulk_spec.rb +1 -1
  310. data/spec/mongo/operation/insert/op_msg_spec.rb +19 -11
  311. data/spec/mongo/operation/insert_spec.rb +0 -32
  312. data/spec/mongo/operation/read_preference_legacy_spec.rb +4 -0
  313. data/spec/mongo/operation/read_preference_op_msg_spec.rb +26 -1
  314. data/spec/mongo/operation/result_spec.rb +20 -0
  315. data/spec/mongo/operation/update/bulk_spec.rb +1 -1
  316. data/spec/mongo/operation/update/op_msg_spec.rb +14 -5
  317. data/spec/mongo/operation/update_spec.rb +0 -29
  318. data/spec/mongo/protocol/caching_hash_spec.rb +82 -0
  319. data/spec/mongo/protocol/msg_spec.rb +41 -0
  320. data/spec/mongo/query_cache_spec.rb +172 -2
  321. data/spec/mongo/retryable_spec.rb +32 -3
  322. data/spec/mongo/server/connection_auth_spec.rb +3 -1
  323. data/spec/mongo/server/connection_common_spec.rb +76 -13
  324. data/spec/mongo/server/connection_pool_spec.rb +178 -45
  325. data/spec/mongo/server/connection_spec.rb +186 -200
  326. data/spec/mongo/server/description/features_spec.rb +24 -0
  327. data/spec/mongo/server/description_spec.rb +1 -1
  328. data/spec/mongo/server/monitor/connection_spec.rb +22 -0
  329. data/spec/mongo/server/monitor_spec.rb +4 -3
  330. data/spec/mongo/server/push_monitor_spec.rb +95 -0
  331. data/spec/mongo/server_selector_spec.rb +136 -15
  332. data/spec/mongo/session/session_pool_spec.rb +42 -10
  333. data/spec/mongo/session_spec.rb +26 -6
  334. data/spec/mongo/session_transaction_spec.rb +15 -29
  335. data/spec/mongo/socket/ssl_spec.rb +42 -63
  336. data/spec/mongo/socket/unix_spec.rb +1 -0
  337. data/spec/mongo/uri/srv_protocol_spec.rb +101 -2
  338. data/spec/mongo/uri_option_parsing_spec.rb +38 -5
  339. data/spec/mongo/uri_spec.rb +25 -0
  340. data/spec/mongo/utils_spec.rb +0 -14
  341. data/spec/runners/auth.rb +1 -1
  342. data/spec/runners/change_streams/spec.rb +1 -1
  343. data/spec/runners/change_streams/test.rb +1 -1
  344. data/spec/runners/cmap.rb +2 -2
  345. data/spec/runners/command_monitoring.rb +1 -1
  346. data/spec/runners/connection_string.rb +16 -4
  347. data/spec/runners/crud/operation.rb +17 -6
  348. data/spec/runners/crud/requirement.rb +10 -4
  349. data/spec/runners/crud/spec.rb +6 -3
  350. data/spec/runners/crud/test.rb +1 -1
  351. data/spec/runners/crud/verifier.rb +7 -2
  352. data/spec/runners/crud.rb +1 -1
  353. data/spec/runners/gridfs.rb +1 -1
  354. data/spec/runners/read_write_concern_document.rb +1 -1
  355. data/spec/runners/sdam.rb +3 -2
  356. data/spec/runners/server_selection.rb +1 -1
  357. data/spec/runners/server_selection_rtt.rb +1 -1
  358. data/spec/runners/transactions/spec.rb +2 -2
  359. data/spec/runners/transactions/test.rb +21 -18
  360. data/spec/runners/transactions.rb +11 -8
  361. data/spec/runners/unified/assertions.rb +95 -15
  362. data/spec/runners/unified/change_stream_operations.rb +12 -0
  363. data/spec/runners/unified/client_side_encryption_operations.rb +83 -0
  364. data/spec/runners/unified/crud_operations.rb +143 -26
  365. data/spec/runners/unified/ddl_operations.rb +74 -1
  366. data/spec/runners/unified/entity_map.rb +3 -3
  367. data/spec/runners/unified/error.rb +2 -1
  368. data/spec/runners/unified/event_subscriber.rb +2 -2
  369. data/spec/runners/unified/grid_fs_operations.rb +21 -0
  370. data/spec/runners/unified/support_operations.rb +21 -5
  371. data/spec/runners/unified/test.rb +96 -8
  372. data/spec/runners/unified/test_group.rb +1 -1
  373. data/spec/runners/unified.rb +10 -3
  374. data/spec/shared/lib/mrss/cluster_config.rb +6 -1
  375. data/spec/shared/lib/mrss/constraints.rb +21 -22
  376. data/spec/shared/lib/mrss/docker_runner.rb +23 -3
  377. data/spec/shared/lib/mrss/eg_config_utils.rb +51 -0
  378. data/spec/shared/lib/mrss/event_subscriber.rb +210 -0
  379. data/spec/shared/lib/mrss/lite_constraints.rb +40 -1
  380. data/spec/shared/lib/mrss/server_version_registry.rb +17 -12
  381. data/spec/shared/lib/mrss/session_registry.rb +69 -0
  382. data/spec/shared/lib/mrss/session_registry_legacy.rb +60 -0
  383. data/spec/shared/share/Dockerfile.erb +61 -58
  384. data/spec/shared/shlib/config.sh +27 -0
  385. data/spec/shared/shlib/distro.sh +2 -1
  386. data/spec/shared/shlib/server.sh +114 -39
  387. data/spec/shared/shlib/set_env.sh +43 -5
  388. data/spec/solo/clean_exit_spec.rb +5 -0
  389. data/spec/spec_helper.rb +0 -1
  390. data/spec/spec_tests/client_side_encryption_spec.rb +1 -1
  391. data/spec/spec_tests/client_side_encryption_unified_spec.rb +16 -0
  392. data/spec/spec_tests/cmap_spec.rb +4 -1
  393. data/spec/spec_tests/crud_spec.rb +0 -10
  394. data/spec/spec_tests/data/change_streams_unified/change-streams-errors.yml +124 -0
  395. data/spec/spec_tests/data/change_streams_unified/change-streams-pre_and_post_images.yml +351 -0
  396. data/spec/spec_tests/data/change_streams_unified/change-streams-resume-allowlist.yml +1171 -0
  397. data/spec/spec_tests/data/change_streams_unified/change-streams-resume-errorLabels.yml +1071 -0
  398. data/spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml +298 -0
  399. data/spec/spec_tests/data/change_streams_unified/change-streams.yml +859 -4
  400. data/spec/spec_tests/data/client_side_encryption/aggregate.yml +3 -17
  401. data/spec/spec_tests/data/client_side_encryption/azureKMS.yml +46 -0
  402. data/spec/spec_tests/data/client_side_encryption/badQueries.yml +12 -2
  403. data/spec/spec_tests/data/client_side_encryption/basic.yml +3 -17
  404. data/spec/spec_tests/data/client_side_encryption/bulk.yml +1 -8
  405. data/spec/spec_tests/data/client_side_encryption/bypassAutoEncryption.yml +2 -2
  406. data/spec/spec_tests/data/client_side_encryption/count.yml +1 -8
  407. data/spec/spec_tests/data/client_side_encryption/countDocuments.yml +1 -8
  408. data/spec/spec_tests/data/client_side_encryption/create-and-createIndexes.yml +58 -0
  409. data/spec/spec_tests/data/client_side_encryption/delete.yml +2 -16
  410. data/spec/spec_tests/data/client_side_encryption/distinct.yml +1 -8
  411. data/spec/spec_tests/data/client_side_encryption/explain.yml +1 -8
  412. data/spec/spec_tests/data/client_side_encryption/find.yml +2 -16
  413. data/spec/spec_tests/data/client_side_encryption/findOneAndDelete.yml +1 -8
  414. data/spec/spec_tests/data/client_side_encryption/findOneAndReplace.yml +1 -8
  415. data/spec/spec_tests/data/client_side_encryption/findOneAndUpdate.yml +1 -8
  416. data/spec/spec_tests/data/client_side_encryption/fle2-BypassQueryAnalysis.yml +101 -0
  417. data/spec/spec_tests/data/client_side_encryption/fle2-Compact.yml +80 -0
  418. data/spec/spec_tests/data/client_side_encryption/fle2-CreateCollection.yml +1263 -0
  419. data/spec/spec_tests/data/client_side_encryption/fle2-DecryptExistingData.yml +64 -0
  420. data/spec/spec_tests/data/client_side_encryption/fle2-Delete.yml +107 -0
  421. data/spec/spec_tests/data/client_side_encryption/fle2-EncryptedFields-vs-EncryptedFieldsMap.yml +80 -0
  422. data/spec/spec_tests/data/client_side_encryption/fle2-EncryptedFields-vs-jsonSchema.yml +90 -0
  423. data/spec/spec_tests/data/client_side_encryption/fle2-EncryptedFieldsMap-defaults.yml +57 -0
  424. data/spec/spec_tests/data/client_side_encryption/fle2-FindOneAndUpdate.yml +213 -0
  425. data/spec/spec_tests/data/client_side_encryption/fle2-InsertFind-Indexed.yml +86 -0
  426. data/spec/spec_tests/data/client_side_encryption/fle2-InsertFind-Unindexed.yml +83 -0
  427. data/spec/spec_tests/data/client_side_encryption/fle2-MissingKey.yml +41 -0
  428. data/spec/spec_tests/data/client_side_encryption/fle2-NoEncryption.yml +42 -0
  429. data/spec/spec_tests/data/client_side_encryption/fle2-Update.yml +221 -0
  430. data/spec/spec_tests/data/client_side_encryption/fle2-validatorAndPartialFieldExpression.yml +168 -0
  431. data/spec/spec_tests/data/client_side_encryption/gcpKMS.yml +46 -0
  432. data/spec/spec_tests/data/client_side_encryption/getMore.yml +1 -8
  433. data/spec/spec_tests/data/client_side_encryption/insert.yml +2 -16
  434. data/spec/spec_tests/data/client_side_encryption/keyAltName.yml +1 -8
  435. data/spec/spec_tests/data/client_side_encryption/localKMS.yml +1 -8
  436. data/spec/spec_tests/data/client_side_encryption/localSchema.yml +1 -8
  437. data/spec/spec_tests/data/client_side_encryption/maxWireVersion.yml +2 -0
  438. data/spec/spec_tests/data/client_side_encryption/missingKey.yml +2 -9
  439. data/spec/spec_tests/data/client_side_encryption/noSchema.yml +39 -0
  440. data/spec/spec_tests/data/client_side_encryption/replaceOne.yml +1 -8
  441. data/spec/spec_tests/data/client_side_encryption/types.yml +44 -70
  442. data/spec/spec_tests/data/client_side_encryption/unified/addKeyAltName.yml +194 -0
  443. data/spec/spec_tests/data/client_side_encryption/unified/createDataKey-kms_providers-invalid.yml +67 -0
  444. data/spec/spec_tests/data/client_side_encryption/unified/createDataKey.yml +309 -0
  445. data/spec/spec_tests/data/client_side_encryption/unified/deleteKey.yml +159 -0
  446. data/spec/spec_tests/data/client_side_encryption/unified/getKey.yml +105 -0
  447. data/spec/spec_tests/data/client_side_encryption/unified/getKeyByAltName.yml +104 -0
  448. data/spec/spec_tests/data/client_side_encryption/unified/getKeys.yml +122 -0
  449. data/spec/spec_tests/data/client_side_encryption/unified/removeKeyAltName.yml +157 -0
  450. data/spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-decrypt_failure.yml +69 -0
  451. data/spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-encrypt_failure.yml +122 -0
  452. data/spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey.yml +432 -0
  453. data/spec/spec_tests/data/client_side_encryption/updateMany.yml +1 -8
  454. data/spec/spec_tests/data/client_side_encryption/updateOne.yml +1 -8
  455. data/spec/spec_tests/data/client_side_encryption/validatorAndPartialFieldExpression.yml +166 -0
  456. data/spec/spec_tests/data/collection_management/clustered-indexes.yml +135 -0
  457. data/spec/spec_tests/data/collection_management/createCollection-pre_and_post_images.yml +50 -0
  458. data/spec/spec_tests/data/collection_management/modifyCollection-pre_and_post_images.yml +58 -0
  459. data/spec/spec_tests/data/command_monitoring_unified/bulkWrite.yml +68 -0
  460. data/spec/spec_tests/data/command_monitoring_unified/command.yml +50 -0
  461. data/spec/spec_tests/data/command_monitoring_unified/deleteMany.yml +79 -0
  462. data/spec/spec_tests/data/command_monitoring_unified/deleteOne.yml +79 -0
  463. data/spec/spec_tests/data/command_monitoring_unified/find.yml +254 -0
  464. data/spec/spec_tests/data/command_monitoring_unified/insertMany.yml +79 -0
  465. data/spec/spec_tests/data/command_monitoring_unified/insertOne.yml +77 -0
  466. data/spec/spec_tests/data/command_monitoring_unified/pre-42-server-connection-id.yml +56 -0
  467. data/spec/spec_tests/data/command_monitoring_unified/server-connection-id.yml +56 -0
  468. data/spec/spec_tests/data/command_monitoring_unified/unacknowledgedBulkWrite.yml +55 -0
  469. data/spec/spec_tests/data/command_monitoring_unified/updateMany.yml +87 -0
  470. data/spec/spec_tests/data/command_monitoring_unified/updateOne.yml +118 -0
  471. data/spec/spec_tests/data/crud/read/aggregate-collation.yml +2 -1
  472. data/spec/spec_tests/data/crud/read/aggregate-out.yml +1 -0
  473. data/spec/spec_tests/data/crud/read/count-collation.yml +2 -1
  474. data/spec/spec_tests/data/crud/read/distinct-collation.yml +2 -1
  475. data/spec/spec_tests/data/crud/read/find-collation.yml +2 -1
  476. data/spec/spec_tests/data/crud/write/bulkWrite-collation.yml +2 -1
  477. data/spec/spec_tests/data/crud/write/deleteMany-collation.yml +2 -1
  478. data/spec/spec_tests/data/crud/write/deleteOne-collation.yml +2 -1
  479. data/spec/spec_tests/data/crud/write/findOneAndDelete-collation.yml +3 -2
  480. data/spec/spec_tests/data/crud/write/findOneAndReplace-collation.yml +2 -1
  481. data/spec/spec_tests/data/crud/write/findOneAndUpdate-collation.yml +3 -2
  482. data/spec/spec_tests/data/crud/write/replaceOne-collation.yml +3 -2
  483. data/spec/spec_tests/data/crud/write/updateMany-collation.yml +2 -1
  484. data/spec/spec_tests/data/crud/write/updateOne-collation.yml +2 -1
  485. data/spec/spec_tests/data/crud_unified/aggregate-allowdiskuse.yml +75 -0
  486. data/spec/spec_tests/data/crud_unified/aggregate-let.yml +138 -0
  487. data/spec/spec_tests/data/crud_unified/aggregate-merge.yml +185 -0
  488. data/spec/spec_tests/data/crud_unified/aggregate-out-readConcern.yml +171 -0
  489. data/spec/spec_tests/data/crud_unified/aggregate-write-readPreference.yml +155 -0
  490. data/spec/spec_tests/data/crud_unified/aggregate.yml +215 -0
  491. data/spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters-clientError.yml +98 -0
  492. data/spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters.yml +174 -0
  493. data/spec/spec_tests/data/crud_unified/bulkWrite-comment.yml +189 -0
  494. data/spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-clientError.yml +113 -0
  495. data/spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-serverError.yml +142 -0
  496. data/spec/spec_tests/data/crud_unified/bulkWrite-delete-hint.yml +154 -0
  497. data/spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-hint-unacknowledged.yml +98 -0
  498. data/spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-let.yml +86 -0
  499. data/spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-hint-unacknowledged.yml +97 -0
  500. data/spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-let.yml +86 -0
  501. data/spec/spec_tests/data/crud_unified/bulkWrite-insertOne-dots_and_dollars.yml +138 -0
  502. data/spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-dots_and_dollars.yml +165 -0
  503. data/spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-hint-unacknowledged.yml +103 -0
  504. data/spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-let.yml +93 -0
  505. data/spec/spec_tests/data/crud_unified/bulkWrite-update-hint-clientError.yml +148 -0
  506. data/spec/spec_tests/data/crud_unified/bulkWrite-update-hint-serverError.yml +239 -0
  507. data/spec/spec_tests/data/crud_unified/bulkWrite-update-hint.yml +256 -0
  508. data/spec/spec_tests/data/crud_unified/bulkWrite-update-validation.yml +73 -0
  509. data/spec/spec_tests/data/crud_unified/bulkWrite-updateMany-dots_and_dollars.yml +150 -0
  510. data/spec/spec_tests/data/crud_unified/bulkWrite-updateMany-hint-unacknowledged.yml +104 -0
  511. data/spec/spec_tests/data/crud_unified/bulkWrite-updateMany-let.yml +96 -0
  512. data/spec/spec_tests/data/crud_unified/bulkWrite-updateOne-dots_and_dollars.yml +150 -0
  513. data/spec/spec_tests/data/crud_unified/bulkWrite-updateOne-hint-unacknowledged.yml +103 -0
  514. data/spec/spec_tests/data/crud_unified/bulkWrite-updateOne-let.yml +95 -0
  515. data/spec/spec_tests/data/crud_unified/countDocuments-comment.yml +92 -0
  516. data/spec/spec_tests/data/crud_unified/db-aggregate-write-readPreference.yml +151 -0
  517. data/spec/spec_tests/data/crud_unified/db-aggregate.yml +73 -0
  518. data/spec/spec_tests/data/crud_unified/deleteMany-comment.yml +97 -0
  519. data/spec/spec_tests/data/crud_unified/deleteMany-hint-clientError.yml +87 -0
  520. data/spec/spec_tests/data/crud_unified/deleteMany-hint-serverError.yml +107 -0
  521. data/spec/spec_tests/data/crud_unified/deleteMany-hint-unacknowledged.yml +90 -0
  522. data/spec/spec_tests/data/crud_unified/deleteMany-hint.yml +99 -0
  523. data/spec/spec_tests/data/crud_unified/deleteMany-let.yml +93 -0
  524. data/spec/spec_tests/data/crud_unified/deleteOne-comment.yml +98 -0
  525. data/spec/spec_tests/data/crud_unified/deleteOne-hint-clientError.yml +80 -0
  526. data/spec/spec_tests/data/crud_unified/deleteOne-hint-serverError.yml +100 -0
  527. data/spec/spec_tests/data/crud_unified/deleteOne-hint-unacknowledged.yml +89 -0
  528. data/spec/spec_tests/data/crud_unified/deleteOne-hint.yml +95 -0
  529. data/spec/spec_tests/data/crud_unified/deleteOne-let.yml +91 -0
  530. data/spec/spec_tests/data/crud_unified/distinct-comment.yml +98 -0
  531. data/spec/spec_tests/data/crud_unified/estimatedDocumentCount-comment.yml +95 -0
  532. data/spec/spec_tests/data/crud_unified/estimatedDocumentCount.yml +5 -135
  533. data/spec/spec_tests/data/crud_unified/find-allowdiskuse-clientError.yml +55 -0
  534. data/spec/spec_tests/data/crud_unified/find-allowdiskuse-serverError.yml +68 -0
  535. data/spec/spec_tests/data/crud_unified/find-allowdiskuse.yml +79 -0
  536. data/spec/spec_tests/data/crud_unified/find-comment.yml +166 -0
  537. data/spec/spec_tests/data/crud_unified/find-let.yml +71 -0
  538. data/spec/spec_tests/data/crud_unified/find.yml +68 -0
  539. data/spec/spec_tests/data/crud_unified/findOneAndDelete-comment.yml +96 -0
  540. data/spec/spec_tests/data/crud_unified/findOneAndDelete-hint-clientError.yml +91 -0
  541. data/spec/spec_tests/data/crud_unified/findOneAndDelete-hint-serverError.yml +107 -0
  542. data/spec/spec_tests/data/crud_unified/findOneAndDelete-hint-unacknowledged.yml +88 -0
  543. data/spec/spec_tests/data/crud_unified/findOneAndDelete-hint.yml +102 -0
  544. data/spec/spec_tests/data/crud_unified/findOneAndDelete-let.yml +86 -0
  545. data/spec/spec_tests/data/crud_unified/findOneAndReplace-comment.yml +101 -0
  546. data/spec/spec_tests/data/crud_unified/findOneAndReplace-dots_and_dollars.yml +140 -0
  547. data/spec/spec_tests/data/crud_unified/findOneAndReplace-hint-clientError.yml +83 -0
  548. data/spec/spec_tests/data/crud_unified/findOneAndReplace-hint-serverError.yml +99 -0
  549. data/spec/spec_tests/data/crud_unified/findOneAndReplace-hint-unacknowledged.yml +96 -0
  550. data/spec/spec_tests/data/crud_unified/findOneAndReplace-hint.yml +98 -0
  551. data/spec/spec_tests/data/crud_unified/findOneAndReplace-let.yml +94 -0
  552. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-comment.yml +95 -0
  553. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-dots_and_dollars.yml +127 -0
  554. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-clientError.yml +84 -0
  555. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-serverError.yml +100 -0
  556. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-unacknowledged.yml +92 -0
  557. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-hint.yml +99 -0
  558. data/spec/spec_tests/data/crud_unified/findOneAndUpdate-let.yml +96 -0
  559. data/spec/spec_tests/data/crud_unified/insertMany-comment.yml +93 -0
  560. data/spec/spec_tests/data/crud_unified/insertMany-dots_and_dollars.yml +128 -0
  561. data/spec/spec_tests/data/crud_unified/insertOne-comment.yml +91 -0
  562. data/spec/spec_tests/data/crud_unified/insertOne-dots_and_dollars.yml +238 -0
  563. data/spec/spec_tests/data/crud_unified/replaceOne-comment.yml +105 -0
  564. data/spec/spec_tests/data/crud_unified/replaceOne-dots_and_dollars.yml +180 -0
  565. data/spec/spec_tests/data/crud_unified/replaceOne-hint-unacknowledged.yml +95 -0
  566. data/spec/spec_tests/data/crud_unified/replaceOne-hint.yml +108 -0
  567. data/spec/spec_tests/data/crud_unified/replaceOne-let.yml +98 -0
  568. data/spec/spec_tests/data/crud_unified/replaceOne-validation.yml +37 -0
  569. data/spec/spec_tests/data/crud_unified/updateMany-comment.yml +104 -0
  570. data/spec/spec_tests/data/crud_unified/updateMany-dots_and_dollars.yml +138 -0
  571. data/spec/spec_tests/data/crud_unified/updateMany-hint-clientError.yml +91 -0
  572. data/spec/spec_tests/data/crud_unified/updateMany-hint-serverError.yml +115 -0
  573. data/spec/spec_tests/data/crud_unified/updateMany-hint-unacknowledged.yml +96 -0
  574. data/spec/spec_tests/data/crud_unified/updateMany-hint.yml +115 -0
  575. data/spec/spec_tests/data/crud_unified/updateMany-let.yml +107 -0
  576. data/spec/spec_tests/data/crud_unified/updateMany-validation.yml +39 -0
  577. data/spec/spec_tests/data/crud_unified/updateOne-comment.yml +104 -0
  578. data/spec/spec_tests/data/crud_unified/updateOne-dots_and_dollars.yml +138 -0
  579. data/spec/spec_tests/data/crud_unified/updateOne-hint-clientError.yml +85 -0
  580. data/spec/spec_tests/data/crud_unified/updateOne-hint-serverError.yml +109 -0
  581. data/spec/spec_tests/data/crud_unified/updateOne-hint-unacknowledged.yml +95 -0
  582. data/spec/spec_tests/data/crud_unified/updateOne-hint.yml +109 -0
  583. data/spec/spec_tests/data/crud_unified/updateOne-let.yml +102 -0
  584. data/spec/spec_tests/data/crud_unified/updateOne-validation.yml +37 -0
  585. data/spec/spec_tests/data/crud_unified/updateWithPipelines.yml +8 -14
  586. data/spec/spec_tests/data/gridfs_unified/delete.yml +198 -0
  587. data/spec/spec_tests/data/gridfs_unified/download.yml +241 -0
  588. data/spec/spec_tests/data/gridfs_unified/downloadByName.yml +159 -0
  589. data/spec/spec_tests/data/gridfs_unified/upload-disableMD5.yml +92 -0
  590. data/spec/spec_tests/data/gridfs_unified/upload.yml +288 -0
  591. data/spec/spec_tests/data/load_balancers/event-monitoring.yml +99 -0
  592. data/spec/spec_tests/data/load_balancers/lb-connection-establishment.yml +36 -0
  593. data/spec/spec_tests/data/load_balancers/non-lb-connection-establishment.yml +56 -0
  594. data/spec/spec_tests/data/load_balancers/server-selection.yml +50 -0
  595. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml +2 -2
  596. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/LastUpdateTime.yml +3 -3
  597. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest.yml +3 -3
  598. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest2.yml +3 -3
  599. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml +2 -2
  600. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml +2 -2
  601. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Secondary.yml +4 -4
  602. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml +2 -2
  603. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml +4 -4
  604. data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml +2 -2
  605. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml +2 -2
  606. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LastUpdateTime.yml +3 -3
  607. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat.yml +2 -2
  608. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml +2 -2
  609. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml +2 -2
  610. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml +2 -2
  611. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest.yml +3 -3
  612. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest2.yml +3 -3
  613. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest_tags.yml +2 -2
  614. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml +2 -2
  615. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml +2 -2
  616. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml +5 -5
  617. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml +3 -3
  618. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags.yml +5 -5
  619. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags2.yml +3 -3
  620. data/spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml +2 -2
  621. data/spec/spec_tests/data/max_staleness/Sharded/SmallMaxStaleness.yml +2 -2
  622. data/spec/spec_tests/data/max_staleness/Single/SmallMaxStaleness.yml +1 -1
  623. data/spec/spec_tests/data/max_staleness/Unknown/SmallMaxStaleness.yml +1 -1
  624. data/spec/spec_tests/data/retryable_reads/{changeStreams-client.watch-serverErrors.yml → legacy/changeStreams-client.watch-serverErrors.yml} +1 -1
  625. data/spec/spec_tests/data/retryable_reads/{changeStreams-client.watch.yml → legacy/changeStreams-client.watch.yml} +1 -1
  626. data/spec/spec_tests/data/retryable_reads/{changeStreams-db.coll.watch-serverErrors.yml → legacy/changeStreams-db.coll.watch-serverErrors.yml} +1 -1
  627. data/spec/spec_tests/data/retryable_reads/{changeStreams-db.coll.watch.yml → legacy/changeStreams-db.coll.watch.yml} +1 -1
  628. data/spec/spec_tests/data/retryable_reads/{changeStreams-db.watch-serverErrors.yml → legacy/changeStreams-db.watch-serverErrors.yml} +1 -1
  629. data/spec/spec_tests/data/retryable_reads/{changeStreams-db.watch.yml → legacy/changeStreams-db.watch.yml} +1 -1
  630. data/spec/spec_tests/data/retryable_reads/{estimatedDocumentCount-serverErrors-pre4.9.yml → legacy/estimatedDocumentCount-serverErrors.yml} +0 -2
  631. data/spec/spec_tests/data/retryable_reads/{estimatedDocumentCount-pre4.9.yml → legacy/estimatedDocumentCount.yml} +0 -2
  632. data/spec/spec_tests/data/retryable_reads/{mapReduce.yml → legacy/mapReduce.yml} +3 -1
  633. data/spec/spec_tests/data/retryable_reads/unified/handshakeError.yml +129 -0
  634. data/spec/spec_tests/data/retryable_writes/{bulkWrite-serverErrors.yml → legacy/bulkWrite-serverErrors.yml} +1 -1
  635. data/spec/spec_tests/data/retryable_writes/{deleteOne-serverErrors.yml → legacy/deleteOne-serverErrors.yml} +1 -1
  636. data/spec/spec_tests/data/retryable_writes/{findOneAndDelete-serverErrors.yml → legacy/findOneAndDelete-serverErrors.yml} +1 -1
  637. data/spec/spec_tests/data/retryable_writes/{findOneAndReplace-serverErrors.yml → legacy/findOneAndReplace-serverErrors.yml} +1 -1
  638. data/spec/spec_tests/data/retryable_writes/{findOneAndUpdate-serverErrors.yml → legacy/findOneAndUpdate-serverErrors.yml} +1 -1
  639. data/spec/spec_tests/data/retryable_writes/{insertMany-serverErrors.yml → legacy/insertMany-serverErrors.yml} +1 -1
  640. data/spec/spec_tests/data/retryable_writes/{insertOne-serverErrors.yml → legacy/insertOne-serverErrors.yml} +5 -5
  641. data/spec/spec_tests/data/retryable_writes/{replaceOne-serverErrors.yml → legacy/replaceOne-serverErrors.yml} +1 -1
  642. data/spec/spec_tests/data/retryable_writes/{updateOne-serverErrors.yml → legacy/updateOne-serverErrors.yml} +1 -1
  643. data/spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml +96 -0
  644. data/spec/spec_tests/data/retryable_writes/unified/handshakeError.yml +137 -0
  645. data/spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml +78 -0
  646. data/spec/spec_tests/data/sdam/errors/prefer-error-code.yml +2 -2
  647. data/spec/spec_tests/data/sdam/load-balanced/discover_load_balancer.yml +25 -0
  648. data/spec/spec_tests/data/sdam_integration/find-network-error.yml +2 -0
  649. data/spec/spec_tests/data/sdam_integration/find-shutdown-error.yml +2 -0
  650. data/spec/spec_tests/data/sdam_integration/hello-command-error.yml +9 -15
  651. data/spec/spec_tests/data/sdam_integration/hello-network-error.yml +7 -15
  652. data/spec/spec_tests/data/sdam_integration/hello-timeout.yml +10 -14
  653. data/spec/spec_tests/data/sdam_integration/insert-network-error.yml +2 -0
  654. data/spec/spec_tests/data/sdam_integration/insert-shutdown-error.yml +2 -0
  655. data/spec/spec_tests/data/sdam_monitoring/load_balancer.yml +65 -0
  656. data/spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-directConnection.yml +13 -0
  657. data/spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-no-results.yml +5 -0
  658. data/spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-replicaSet-errors.yml +6 -0
  659. data/spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-multiple-hosts.yml +5 -0
  660. data/spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-txt.yml +10 -0
  661. data/spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml +5 -0
  662. data/spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml +5 -0
  663. data/spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero-txt.yml +10 -0
  664. data/spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero.yml +10 -0
  665. data/spec/spec_tests/data/seed_list_discovery/replica-set/encoded-userinfo-and-db.yml +15 -0
  666. data/spec/spec_tests/data/seed_list_discovery/replica-set/loadBalanced-false-txt.yml +10 -0
  667. data/spec/spec_tests/data/seed_list_discovery/replica-set/srv-service-name.yml +11 -0
  668. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml +5 -0
  669. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml +5 -0
  670. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml +16 -0
  671. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml +15 -0
  672. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-less_than_srv_records.yml +15 -0
  673. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero-txt.yml +15 -0
  674. data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero.yml +15 -0
  675. data/spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-admin-database.yml +13 -0
  676. data/spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-auth.yml +12 -0
  677. data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-equal_to_srv_records.yml +13 -0
  678. data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-greater_than_srv_records.yml +12 -0
  679. data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-less_than_srv_records.yml +10 -0
  680. data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-zero.yml +11 -0
  681. data/spec/spec_tests/data/server_selection/Unknown/read/ghost.yml +11 -0
  682. data/spec/spec_tests/data/server_selection/Unknown/write/ghost.yml +11 -0
  683. data/spec/spec_tests/data/sessions_unified/driver-sessions-server-support.yml +123 -0
  684. data/spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-client-error.yml +75 -0
  685. data/spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-server-error.yml +102 -0
  686. data/spec/spec_tests/data/sessions_unified/snapshot-sessions-unsupported-ops.yml +258 -0
  687. data/spec/spec_tests/data/sessions_unified/snapshot-sessions.yml +482 -0
  688. data/spec/spec_tests/data/transactions/error-labels.yml +1 -1
  689. data/spec/spec_tests/data/transactions/errors-client.yml +8 -9
  690. data/spec/spec_tests/data/transactions/mongos-recovery-token.yml +1 -1
  691. data/spec/spec_tests/data/transactions/retryable-abort.yml +7 -7
  692. data/spec/spec_tests/data/transactions/retryable-commit.yml +7 -7
  693. data/spec/spec_tests/data/transactions_unified/do-not-retry-read-in-transaction.yml +64 -0
  694. data/spec/spec_tests/data/transactions_unified/retryable-abort-handshake.yml +118 -0
  695. data/spec/spec_tests/data/transactions_unified/retryable-commit-handshake.yml +118 -0
  696. data/spec/spec_tests/data/unified/invalid/expectedEventsForClient-ignoreExtraEvents-type.yml +15 -0
  697. data/spec/spec_tests/data/unified/valid-fail/operation-unsupported.yml +13 -0
  698. data/spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml +78 -0
  699. data/spec/spec_tests/data/unified/valid-pass/poc-change-streams.yml +4 -1
  700. data/spec/spec_tests/data/unified/valid-pass/poc-command-monitoring.yml +3 -3
  701. data/spec/spec_tests/data/unified/valid-pass/poc-transactions.yml +3 -2
  702. data/spec/spec_tests/data/uri_options/connection-options.yml +60 -0
  703. data/spec/spec_tests/data/uri_options/srv-options.yml +96 -0
  704. data/spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml +6 -4
  705. data/spec/spec_tests/data/versioned_api/crud-api-version-1.yml +7 -5
  706. data/spec/spec_tests/gridfs_unified_spec.rb +13 -0
  707. data/spec/spec_tests/load_balancers_spec.rb +15 -0
  708. data/spec/spec_tests/retryable_reads_spec.rb +6 -3
  709. data/spec/spec_tests/retryable_reads_unified_spec.rb +22 -0
  710. data/spec/spec_tests/retryable_writes_spec.rb +5 -2
  711. data/spec/spec_tests/retryable_writes_unified_spec.rb +21 -0
  712. data/spec/spec_tests/sdam_integration_spec.rb +1 -1
  713. data/spec/spec_tests/sdam_monitoring_spec.rb +10 -5
  714. data/spec/spec_tests/sdam_spec.rb +1 -1
  715. data/spec/spec_tests/seed_list_discovery_spec.rb +127 -0
  716. data/spec/spec_tests/sessions_unified_spec.rb +13 -0
  717. data/spec/spec_tests/unified_spec.rb +6 -1
  718. data/spec/spec_tests/uri_options_spec.rb +4 -4
  719. data/spec/stress/connection_pool_timing_spec.rb +3 -2
  720. data/spec/stress/fork_reconnect_stress_spec.rb +4 -7
  721. data/spec/stress/push_monitor_close_spec.rb +44 -0
  722. data/spec/support/authorization.rb +1 -1
  723. data/spec/support/background_thread_registry.rb +3 -13
  724. data/spec/support/certificates/atlas-ocsp-ca.crt +81 -96
  725. data/spec/support/certificates/atlas-ocsp.crt +125 -125
  726. data/spec/support/certificates/retrieve-atlas-cert +38 -0
  727. data/spec/support/cluster_tools.rb +1 -1
  728. data/spec/support/common_shortcuts.rb +24 -3
  729. data/spec/support/crypt/corpus/corpus-encrypted.json +9515 -0
  730. data/spec/support/crypt/corpus/corpus-key-aws.json +32 -32
  731. data/spec/support/crypt/corpus/corpus-key-azure.json +33 -0
  732. data/spec/support/crypt/corpus/corpus-key-gcp.json +35 -0
  733. data/spec/support/crypt/corpus/corpus-key-kmip.json +32 -0
  734. data/spec/support/crypt/corpus/corpus-key-local.json +30 -30
  735. data/spec/support/crypt/corpus/corpus-schema.json +4399 -121
  736. data/spec/support/crypt/corpus/corpus.json +4999 -37
  737. data/spec/support/crypt/data_keys/key_document_azure.json +33 -0
  738. data/spec/support/crypt/data_keys/key_document_gcp.json +37 -0
  739. data/spec/support/crypt/data_keys/key_document_kmip.json +32 -0
  740. data/spec/support/crypt/encryptedFields.json +33 -0
  741. data/spec/support/crypt/keys/key1-document.json +30 -0
  742. data/spec/support/crypt/schema_maps/schema_map_azure.json +17 -0
  743. data/spec/support/crypt/schema_maps/schema_map_azure_key_alt_names.json +12 -0
  744. data/spec/support/crypt/schema_maps/schema_map_gcp.json +17 -0
  745. data/spec/support/crypt/schema_maps/schema_map_gcp_key_alt_names.json +12 -0
  746. data/spec/support/crypt/schema_maps/schema_map_kmip.json +17 -0
  747. data/spec/support/crypt/schema_maps/schema_map_kmip_key_alt_names.json +12 -0
  748. data/spec/support/crypt.rb +258 -13
  749. data/spec/support/macros.rb +28 -0
  750. data/spec/support/matchers.rb +13 -0
  751. data/spec/support/mongos_macros.rb +17 -0
  752. data/spec/support/shared/auth_context.rb +16 -0
  753. data/spec/support/shared/scram_conversation.rb +2 -1
  754. data/spec/support/shared/session.rb +15 -9
  755. data/spec/support/spec_config.rb +100 -12
  756. data/spec/support/using_hash.rb +31 -0
  757. data/spec/support/utils.rb +57 -5
  758. data.tar.gz.sig +0 -0
  759. metadata +778 -381
  760. metadata.gz.sig +0 -0
  761. data/lib/mongo/collection/view/builder/find_command.rb +0 -173
  762. data/lib/mongo/collection/view/builder/op_query.rb +0 -94
  763. data/lib/mongo/cursor/builder/get_more_command.rb +0 -80
  764. data/lib/mongo/cursor/builder/kill_cursors_command.rb +0 -111
  765. data/lib/mongo/cursor/builder/op_get_more.rb +0 -64
  766. data/lib/mongo/cursor/builder/op_kill_cursors.rb +0 -106
  767. data/lib/mongo/operation/insert/legacy.rb +0 -68
  768. data/lib/mongo/operation/update/legacy/result.rb +0 -112
  769. data/lib/mongo/operation/update/legacy.rb +0 -68
  770. data/lib/mongo/server/context.rb +0 -72
  771. data/spec/mongo/cursor/builder/op_kill_cursors_spec.rb +0 -66
  772. data/spec/mongo/dbref_spec.rb +0 -152
  773. data/spec/mongo/operation/kill_cursors_spec.rb +0 -44
  774. data/spec/runners/unified/using_hash.rb +0 -34
  775. data/spec/spec_tests/change_streams_spec.rb +0 -93
  776. data/spec/spec_tests/command_monitoring_spec.rb +0 -71
  777. data/spec/spec_tests/data/change_streams/change-streams-errors.yml +0 -101
  778. data/spec/spec_tests/data/change_streams/change-streams-resume-allowlist.yml +0 -1173
  779. data/spec/spec_tests/data/change_streams/change-streams-resume-errorLabels.yml +0 -1105
  780. data/spec/spec_tests/data/change_streams/change-streams.yml +0 -535
  781. data/spec/spec_tests/data/command_monitoring/bulkWrite.yml +0 -49
  782. data/spec/spec_tests/data/command_monitoring/command.yml +0 -61
  783. data/spec/spec_tests/data/command_monitoring/deleteMany.yml +0 -55
  784. data/spec/spec_tests/data/command_monitoring/deleteOne.yml +0 -55
  785. data/spec/spec_tests/data/command_monitoring/find.yml +0 -266
  786. data/spec/spec_tests/data/command_monitoring/insertMany.yml +0 -75
  787. data/spec/spec_tests/data/command_monitoring/insertOne.yml +0 -51
  788. data/spec/spec_tests/data/command_monitoring/unacknowledgedBulkWrite.yml +0 -34
  789. data/spec/spec_tests/data/command_monitoring/updateMany.yml +0 -65
  790. data/spec/spec_tests/data/command_monitoring/updateOne.yml +0 -90
  791. data/spec/spec_tests/data/crud_v2/aggregate-merge.yml +0 -103
  792. data/spec/spec_tests/data/crud_v2/aggregate-out-readConcern.yml +0 -111
  793. data/spec/spec_tests/data/crud_v2/bulkWrite-arrayFilters.yml +0 -103
  794. data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint-clientError.yml +0 -63
  795. data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint-serverError.yml +0 -92
  796. data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint.yml +0 -103
  797. data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint-clientError.yml +0 -90
  798. data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint-serverError.yml +0 -147
  799. data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint.yml +0 -164
  800. data/spec/spec_tests/data/crud_v2/db-aggregate.yml +0 -39
  801. data/spec/spec_tests/data/crud_v2/deleteMany-hint-clientError.yml +0 -43
  802. data/spec/spec_tests/data/crud_v2/deleteMany-hint-serverError.yml +0 -62
  803. data/spec/spec_tests/data/crud_v2/deleteMany-hint.yml +0 -58
  804. data/spec/spec_tests/data/crud_v2/deleteOne-hint-clientError.yml +0 -41
  805. data/spec/spec_tests/data/crud_v2/deleteOne-hint-serverError.yml +0 -60
  806. data/spec/spec_tests/data/crud_v2/deleteOne-hint.yml +0 -57
  807. data/spec/spec_tests/data/crud_v2/find-allowdiskuse-clientError.yml +0 -28
  808. data/spec/spec_tests/data/crud_v2/find-allowdiskuse-serverError.yml +0 -44
  809. data/spec/spec_tests/data/crud_v2/find-allowdiskuse.yml +0 -50
  810. data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint-clientError.yml +0 -45
  811. data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint-serverError.yml +0 -60
  812. data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint.yml +0 -56
  813. data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint-clientError.yml +0 -40
  814. data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint-serverError.yml +0 -59
  815. data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint.yml +0 -55
  816. data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint-clientError.yml +0 -40
  817. data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint-serverError.yml +0 -58
  818. data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint.yml +0 -55
  819. data/spec/spec_tests/data/crud_v2/replaceOne-hint.yml +0 -61
  820. data/spec/spec_tests/data/crud_v2/unacknowledged-bulkWrite-delete-hint-clientError.yml +0 -60
  821. data/spec/spec_tests/data/crud_v2/unacknowledged-bulkWrite-update-hint-clientError.yml +0 -88
  822. data/spec/spec_tests/data/crud_v2/unacknowledged-deleteMany-hint-clientError.yml +0 -40
  823. data/spec/spec_tests/data/crud_v2/unacknowledged-deleteOne-hint-clientError.yml +0 -38
  824. data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndDelete-hint-clientError.yml +0 -42
  825. data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndReplace-hint-clientError.yml +0 -40
  826. data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndUpdate-hint-clientError.yml +0 -40
  827. data/spec/spec_tests/data/crud_v2/unacknowledged-replaceOne-hint-clientError.yml +0 -40
  828. data/spec/spec_tests/data/crud_v2/unacknowledged-updateMany-hint-clientError.yml +0 -43
  829. data/spec/spec_tests/data/crud_v2/unacknowledged-updateOne-hint-clientError.yml +0 -40
  830. data/spec/spec_tests/data/crud_v2/updateMany-hint-clientError.yml +0 -45
  831. data/spec/spec_tests/data/crud_v2/updateMany-hint-serverError.yml +0 -66
  832. data/spec/spec_tests/data/crud_v2/updateMany-hint.yml +0 -65
  833. data/spec/spec_tests/data/crud_v2/updateOne-hint-clientError.yml +0 -43
  834. data/spec/spec_tests/data/crud_v2/updateOne-hint-serverError.yml +0 -62
  835. data/spec/spec_tests/data/crud_v2/updateOne-hint.yml +0 -61
  836. data/spec/spec_tests/data/crud_v2/updateWithPipelines.yml +0 -157
  837. data/spec/spec_tests/data/retryable_reads/estimatedDocumentCount-4.9.yml +0 -60
  838. data/spec/spec_tests/data/retryable_reads/estimatedDocumentCount-serverErrors-4.9.yml +0 -146
  839. data/spec/spec_tests/dns_seedlist_discovery_spec.rb +0 -79
  840. data/spec/support/crypt/corpus/corpus_encrypted.json +0 -4152
  841. data/spec/support/event_subscriber.rb +0 -221
  842. data/spec/support/session_registry.rb +0 -55
  843. /data/spec/spec_tests/data/retryable_reads/{aggregate-merge.yml → legacy/aggregate-merge.yml} +0 -0
  844. /data/spec/spec_tests/data/retryable_reads/{aggregate-serverErrors.yml → legacy/aggregate-serverErrors.yml} +0 -0
  845. /data/spec/spec_tests/data/retryable_reads/{aggregate.yml → legacy/aggregate.yml} +0 -0
  846. /data/spec/spec_tests/data/retryable_reads/{count-serverErrors.yml → legacy/count-serverErrors.yml} +0 -0
  847. /data/spec/spec_tests/data/retryable_reads/{count.yml → legacy/count.yml} +0 -0
  848. /data/spec/spec_tests/data/retryable_reads/{countDocuments-serverErrors.yml → legacy/countDocuments-serverErrors.yml} +0 -0
  849. /data/spec/spec_tests/data/retryable_reads/{countDocuments.yml → legacy/countDocuments.yml} +0 -0
  850. /data/spec/spec_tests/data/retryable_reads/{distinct-serverErrors.yml → legacy/distinct-serverErrors.yml} +0 -0
  851. /data/spec/spec_tests/data/retryable_reads/{distinct.yml → legacy/distinct.yml} +0 -0
  852. /data/spec/spec_tests/data/retryable_reads/{find-serverErrors.yml → legacy/find-serverErrors.yml} +0 -0
  853. /data/spec/spec_tests/data/retryable_reads/{find.yml → legacy/find.yml} +0 -0
  854. /data/spec/spec_tests/data/retryable_reads/{findOne-serverErrors.yml → legacy/findOne-serverErrors.yml} +0 -0
  855. /data/spec/spec_tests/data/retryable_reads/{findOne.yml → legacy/findOne.yml} +0 -0
  856. /data/spec/spec_tests/data/retryable_reads/{gridfs-download-serverErrors.yml → legacy/gridfs-download-serverErrors.yml} +0 -0
  857. /data/spec/spec_tests/data/retryable_reads/{gridfs-download.yml → legacy/gridfs-download.yml} +0 -0
  858. /data/spec/spec_tests/data/retryable_reads/{gridfs-downloadByName-serverErrors.yml → legacy/gridfs-downloadByName-serverErrors.yml} +0 -0
  859. /data/spec/spec_tests/data/retryable_reads/{gridfs-downloadByName.yml → legacy/gridfs-downloadByName.yml} +0 -0
  860. /data/spec/spec_tests/data/retryable_reads/{listCollectionNames-serverErrors.yml → legacy/listCollectionNames-serverErrors.yml} +0 -0
  861. /data/spec/spec_tests/data/retryable_reads/{listCollectionNames.yml → legacy/listCollectionNames.yml} +0 -0
  862. /data/spec/spec_tests/data/retryable_reads/{listCollectionObjects-serverErrors.yml → legacy/listCollectionObjects-serverErrors.yml} +0 -0
  863. /data/spec/spec_tests/data/retryable_reads/{listCollectionObjects.yml → legacy/listCollectionObjects.yml} +0 -0
  864. /data/spec/spec_tests/data/retryable_reads/{listCollections-serverErrors.yml → legacy/listCollections-serverErrors.yml} +0 -0
  865. /data/spec/spec_tests/data/retryable_reads/{listCollections.yml → legacy/listCollections.yml} +0 -0
  866. /data/spec/spec_tests/data/retryable_reads/{listDatabaseNames-serverErrors.yml → legacy/listDatabaseNames-serverErrors.yml} +0 -0
  867. /data/spec/spec_tests/data/retryable_reads/{listDatabaseNames.yml → legacy/listDatabaseNames.yml} +0 -0
  868. /data/spec/spec_tests/data/retryable_reads/{listDatabaseObjects-serverErrors.yml → legacy/listDatabaseObjects-serverErrors.yml} +0 -0
  869. /data/spec/spec_tests/data/retryable_reads/{listDatabaseObjects.yml → legacy/listDatabaseObjects.yml} +0 -0
  870. /data/spec/spec_tests/data/retryable_reads/{listDatabases-serverErrors.yml → legacy/listDatabases-serverErrors.yml} +0 -0
  871. /data/spec/spec_tests/data/retryable_reads/{listDatabases.yml → legacy/listDatabases.yml} +0 -0
  872. /data/spec/spec_tests/data/retryable_reads/{listIndexNames-serverErrors.yml → legacy/listIndexNames-serverErrors.yml} +0 -0
  873. /data/spec/spec_tests/data/retryable_reads/{listIndexNames.yml → legacy/listIndexNames.yml} +0 -0
  874. /data/spec/spec_tests/data/retryable_reads/{listIndexes-serverErrors.yml → legacy/listIndexes-serverErrors.yml} +0 -0
  875. /data/spec/spec_tests/data/retryable_reads/{listIndexes.yml → legacy/listIndexes.yml} +0 -0
  876. /data/spec/spec_tests/data/retryable_writes/{bulkWrite-errorLabels.yml → legacy/bulkWrite-errorLabels.yml} +0 -0
  877. /data/spec/spec_tests/data/retryable_writes/{bulkWrite.yml → legacy/bulkWrite.yml} +0 -0
  878. /data/spec/spec_tests/data/retryable_writes/{deleteMany.yml → legacy/deleteMany.yml} +0 -0
  879. /data/spec/spec_tests/data/retryable_writes/{deleteOne-errorLabels.yml → legacy/deleteOne-errorLabels.yml} +0 -0
  880. /data/spec/spec_tests/data/retryable_writes/{deleteOne.yml → legacy/deleteOne.yml} +0 -0
  881. /data/spec/spec_tests/data/retryable_writes/{findOneAndDelete-errorLabels.yml → legacy/findOneAndDelete-errorLabels.yml} +0 -0
  882. /data/spec/spec_tests/data/retryable_writes/{findOneAndDelete.yml → legacy/findOneAndDelete.yml} +0 -0
  883. /data/spec/spec_tests/data/retryable_writes/{findOneAndReplace-errorLabels.yml → legacy/findOneAndReplace-errorLabels.yml} +0 -0
  884. /data/spec/spec_tests/data/retryable_writes/{findOneAndReplace.yml → legacy/findOneAndReplace.yml} +0 -0
  885. /data/spec/spec_tests/data/retryable_writes/{findOneAndUpdate-errorLabels.yml → legacy/findOneAndUpdate-errorLabels.yml} +0 -0
  886. /data/spec/spec_tests/data/retryable_writes/{findOneAndUpdate.yml → legacy/findOneAndUpdate.yml} +0 -0
  887. /data/spec/spec_tests/data/retryable_writes/{insertMany-errorLabels.yml → legacy/insertMany-errorLabels.yml} +0 -0
  888. /data/spec/spec_tests/data/retryable_writes/{insertMany.yml → legacy/insertMany.yml} +0 -0
  889. /data/spec/spec_tests/data/retryable_writes/{insertOne-errorLabels.yml → legacy/insertOne-errorLabels.yml} +0 -0
  890. /data/spec/spec_tests/data/retryable_writes/{insertOne.yml → legacy/insertOne.yml} +0 -0
  891. /data/spec/spec_tests/data/retryable_writes/{replaceOne-errorLabels.yml → legacy/replaceOne-errorLabels.yml} +0 -0
  892. /data/spec/spec_tests/data/retryable_writes/{replaceOne.yml → legacy/replaceOne.yml} +0 -0
  893. /data/spec/spec_tests/data/retryable_writes/{updateMany.yml → legacy/updateMany.yml} +0 -0
  894. /data/spec/spec_tests/data/retryable_writes/{updateOne-errorLabels.yml → legacy/updateOne-errorLabels.yml} +0 -0
  895. /data/spec/spec_tests/data/retryable_writes/{updateOne.yml → legacy/updateOne.yml} +0 -0
  896. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/direct-connection-false.yml +0 -0
  897. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/direct-connection-true.yml +0 -0
  898. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/longer-parent-in-return.yml +0 -0
  899. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/misformatted-option.yml +0 -0
  900. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/no-results.yml +0 -0
  901. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/not-enough-parts.yml +0 -0
  902. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/one-result-default-port.yml +0 -0
  903. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/one-txt-record-multiple-strings.yml +0 -0
  904. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/one-txt-record.yml +0 -0
  905. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/parent-part-mismatch1.yml +0 -0
  906. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/parent-part-mismatch2.yml +0 -0
  907. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/parent-part-mismatch3.yml +0 -0
  908. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/parent-part-mismatch4.yml +0 -0
  909. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/parent-part-mismatch5.yml +0 -0
  910. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/returned-parent-too-short.yml +0 -0
  911. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/returned-parent-wrong.yml +0 -0
  912. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/two-results-default-port.yml +0 -0
  913. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/two-results-nonstandard-port.yml +0 -0
  914. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/two-txt-records.yml +0 -0
  915. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/txt-record-not-allowed-option.yml +0 -0
  916. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/txt-record-with-overridden-ssl-option.yml +0 -0
  917. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/txt-record-with-overridden-uri-option.yml +0 -0
  918. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/txt-record-with-unallowed-option.yml +0 -0
  919. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/uri-with-port.yml +0 -0
  920. /data/spec/spec_tests/data/{dns_seedlist_discovery → seed_list_discovery/replica-set}/uri-with-two-hosts.yml +0 -0
@@ -35,13 +35,14 @@ module Mongo
35
35
  # that implements driver I/O methods required to run the
36
36
  # state machine.
37
37
  def initialize(mongocrypt_handle, io)
38
+ @mongocrypt_handle = mongocrypt_handle
38
39
  # Ideally, this level of the API wouldn't be passing around pointer
39
40
  # references between objects, so this method signature is subject to change.
40
41
 
41
42
  # FFI::AutoPointer uses a custom release strategy to automatically free
42
43
  # the pointer once this object goes out of scope
43
44
  @ctx_p = FFI::AutoPointer.new(
44
- Binding.mongocrypt_ctx_new(mongocrypt_handle.ref),
45
+ Binding.mongocrypt_ctx_new(@mongocrypt_handle.ref),
45
46
  Binding.method(:mongocrypt_ctx_destroy)
46
47
  )
47
48
 
@@ -103,7 +104,9 @@ module Mongo
103
104
  mongocrypt_done
104
105
  when :need_kms
105
106
  while kms_context = Binding.ctx_next_kms_ctx(self) do
106
- @encryption_io.feed_kms(kms_context)
107
+ provider = Binding.kms_ctx_get_kms_provider(kms_context)
108
+ tls_options = @mongocrypt_handle.kms_tls_options(provider)
109
+ @encryption_io.feed_kms(kms_context, tls_options)
107
110
  end
108
111
 
109
112
  Binding.ctx_kms_done(self)
@@ -19,7 +19,7 @@ module Mongo
19
19
  module Crypt
20
20
 
21
21
  # A Context object initialized specifically for the purpose of creating
22
- # a data key in the key managemenet system.
22
+ # a data key in the key management system.
23
23
  #
24
24
  # @api private
25
25
  class DataKeyContext < Context
@@ -30,116 +30,24 @@ module Mongo
30
30
  # wraps a mongocrypt_t object used to create a new mongocrypt_ctx_t
31
31
  # @param [ Mongo::Crypt::EncryptionIO ] io An object that performs all
32
32
  # driver I/O on behalf of libmongocrypt
33
- # @param [ String ] kms_provider The KMS provider to use. Options are
34
- # "aws" and "local".
35
- # @param [ Hash ] options Data key creation options.
36
- #
37
- # @option options [ Hash ] :master_key A Hash of options related to the AWS
38
- # KMS provider option. Required if kms_provider is "aws".
39
- # - :region [ String ] The The AWS region of the master key (required).
40
- # - :key [ String ] The Amazon Resource Name (ARN) of the master key (required).
41
- # - :endpoint [ String ] An alternate host to send KMS requests to (optional).
42
- # @option options [ Array<String> ] :key_alt_names An optional array of strings specifying
33
+ # @param [ Mongo::Crypt::KMS::MasterKeyDocument ] master_key_document The master
34
+ # key document that contains master encryption key parameters.
35
+ # @param [ Array<String> | nil ] key_alt_names An optional array of strings specifying
43
36
  # alternate names for the new data key.
44
- def initialize(mongocrypt, io, kms_provider, options={})
37
+ # @param [ String | nil ] :key_material Optional
38
+ # 96 bytes to use as custom key material for the data key being created.
39
+ # If :key_material option is given, the custom key material is used
40
+ # for encrypting and decrypting data.
41
+ def initialize(mongocrypt, io, master_key_document, key_alt_names, key_material)
45
42
  super(mongocrypt, io)
46
-
47
- case kms_provider
48
- when 'local'
49
- Binding.ctx_setopt_master_key_local(self)
50
- when 'aws'
51
- unless options
52
- raise ArgumentError.new(
53
- 'When "aws" is specified as the KMS provider, options cannot be nil'
54
- )
55
- end
56
-
57
- unless options.key?(:master_key)
58
- raise ArgumentError.new(
59
- 'When "aws" is specified as the KMS provider, the options Hash ' +
60
- 'must contain a key named :master_key with a Hash value in the ' +
61
- '{ region: "AWS-REGION", key: "AWS-KEY-ARN" }'
62
- )
63
- end
64
-
65
- master_key_opts = options[:master_key]
66
-
67
- set_aws_master_key(master_key_opts)
68
- set_aws_endpoint(master_key_opts[:endpoint]) if master_key_opts[:endpoint]
69
- else
70
- raise ArgumentError.new(
71
- "#{kms_provider} is an invalid kms provider. " +
72
- "Valid options are 'aws' and 'local'"
73
- )
74
- end
75
-
76
- set_key_alt_names(options[:key_alt_names]) if options[:key_alt_names]
43
+ Binding.ctx_setopt_key_encryption_key(self, master_key_document.to_document)
44
+ set_key_alt_names(key_alt_names) if key_alt_names
45
+ Binding.ctx_setopt_key_material(self, BSON::Binary.new(key_material)) if key_material
77
46
  initialize_ctx
78
47
  end
79
48
 
80
49
  private
81
50
 
82
- # Configure the underlying mongocrypt_ctx_t object to accept AWS
83
- # KMS options
84
- def set_aws_master_key(master_key_opts)
85
- unless master_key_opts
86
- raise ArgumentError.new('The :master_key option cannot be nil')
87
- end
88
-
89
- unless master_key_opts.is_a?(Hash)
90
- raise ArgumentError.new(
91
- "#{master_key_opts} is an invalid :master_key option. " +
92
- "The :master_key option must be a Hash in the format " +
93
- "{ region: 'AWS-REGION', key: 'AWS-KEY-ARN' }"
94
- )
95
- end
96
-
97
- region = master_key_opts[:region]
98
- unless region
99
- raise ArgumentError.new(
100
- 'The value of :region option of the :master_key options hash cannot be nil'
101
- )
102
- end
103
-
104
- unless region.is_a?(String)
105
- raise ArgumentError.new(
106
- "#{master_key_opts[:region]} is an invalid AWS master_key region. " +
107
- "The value of :region option of the :master_key options hash must be a String"
108
- )
109
- end
110
-
111
- key = master_key_opts[:key]
112
- unless key
113
- raise ArgumentError.new(
114
- 'The value of :key option of the :master_key options hash cannot be nil'
115
- )
116
- end
117
-
118
- unless key.is_a?(String)
119
- raise ArgumentError.new(
120
- "#{master_key_opts[:key]} is an invalid AWS master_key key. " +
121
- "The value of :key option of the :master_key options hash must be a String"
122
- )
123
- end
124
-
125
- Binding.ctx_setopt_master_key_aws(
126
- self,
127
- region,
128
- key,
129
- )
130
- end
131
-
132
- def set_aws_endpoint(endpoint)
133
- unless endpoint.is_a?(String)
134
- raise ArgumentError.new(
135
- "#{endpoint} is an invalid AWS master_key endpoint. " +
136
- "The value of :endpoint option of the :master_key options hash must be a String"
137
- )
138
- end
139
-
140
- Binding.ctx_setopt_master_key_aws_endpoint(self, endpoint)
141
- end
142
-
143
51
  # Set the alt names option on the context
144
52
  def set_key_alt_names(key_alt_names)
145
53
  unless key_alt_names.is_a?(Array)
@@ -38,6 +38,8 @@ module Mongo
38
38
  # defaults to nil.
39
39
  # @param [ Mongo::Client ] key_vault_client The client connected to the
40
40
  # key vault collection.
41
+ # @param [ Mongo::Client | nil ] metadata_client The client to be used to
42
+ # obtain collection metadata.
41
43
  # @param [ String ] key_vault_namespace The key vault namespace in the format
42
44
  # db_name.collection_name.
43
45
  # @param [ Hash ] mongocryptd_options Options related to mongocryptd.
@@ -54,7 +56,7 @@ module Mongo
54
56
  # options are not nil and are in the correct format.
55
57
  def initialize(
56
58
  client: nil, mongocryptd_client: nil, key_vault_namespace:,
57
- key_vault_client:, mongocryptd_options: {}
59
+ key_vault_client:, metadata_client:, mongocryptd_options: {}
58
60
  )
59
61
  validate_key_vault_client!(key_vault_client)
60
62
  validate_key_vault_namespace!(key_vault_namespace)
@@ -63,6 +65,7 @@ module Mongo
63
65
  @mongocryptd_client = mongocryptd_client
64
66
  @key_vault_db_name, @key_vault_collection_name = key_vault_namespace.split('.')
65
67
  @key_vault_client = key_vault_client
68
+ @metadata_client = metadata_client
66
69
  @options = mongocryptd_options
67
70
  end
68
71
 
@@ -91,11 +94,11 @@ module Mongo
91
94
  #
92
95
  # @return [ Hash ] The collection information
93
96
  def collection_info(db_name, filter)
94
- unless @client
95
- raise ArgumentError, 'collection_info requires client to have been passed to the constructor, but it was not'
97
+ unless @metadata_client
98
+ raise ArgumentError, 'collection_info requires metadata_client to have been passed to the constructor, but it was not'
96
99
  end
97
100
 
98
- @client.use(db_name).database.list_collections(filter: filter).first
101
+ @metadata_client.use(db_name).database.list_collections(filter: filter).first
99
102
  end
100
103
 
101
104
  # Send the command to mongocryptd to be marked with intent-to-encrypt markings
@@ -124,16 +127,17 @@ module Mongo
124
127
  return response.first
125
128
  end
126
129
 
127
- # Get information about the AWS encryption key and feed it to the the
130
+ # Get information about the remote KMS encryption key and feed it to the the
128
131
  # KmsContext object
129
132
  #
130
133
  # @param [ Mongo::Crypt::KmsContext ] kms_context A KmsContext object
131
- # corresponding to one AWS KMS data key. Contains information about
134
+ # corresponding to one remote KMS data key. Contains information about
132
135
  # the endpoint at which to establish a TLS connection and the message
133
136
  # to send on that connection.
134
- def feed_kms(kms_context)
135
- with_ssl_socket(kms_context.endpoint) do |ssl_socket|
136
-
137
+ # @param [ Hash ] tls_options. TLS options to connect to KMS provider.
138
+ # The options are same as for Mongo::Client.
139
+ def feed_kms(kms_context, tls_options)
140
+ with_ssl_socket(kms_context.endpoint, tls_options) do |ssl_socket|
137
141
  Timeout.timeout(SOCKET_TIMEOUT, Error::SocketTimeoutError,
138
142
  'Socket write operation timed out'
139
143
  ) do
@@ -154,6 +158,72 @@ module Mongo
154
158
  end
155
159
  end
156
160
 
161
+ # Adds a key_alt_name to the key_alt_names array of the key document
162
+ # in the key vault collection with the given id.
163
+ def add_key_alt_name(id, key_alt_name)
164
+ key_vault_collection.find_one_and_update(
165
+ { _id: id },
166
+ { '$addToSet' => { keyAltNames: key_alt_name } },
167
+ )
168
+ end
169
+
170
+ # Removes the key document with the given id
171
+ # from the key vault collection.
172
+ def delete_key(id)
173
+ key_vault_collection.delete_one(_id: id)
174
+ end
175
+
176
+ # Finds a single key document with the given id.
177
+ def get_key(id)
178
+ key_vault_collection.find(_id: id).first
179
+ end
180
+
181
+ # Returns a key document in the key vault collection with
182
+ # the given key_alt_name.
183
+ def get_key_by_alt_name(key_alt_name)
184
+ key_vault_collection.find(keyAltNames: key_alt_name).first
185
+ end
186
+
187
+ # Finds all documents in the key vault collection.
188
+ def get_keys
189
+ key_vault_collection.find
190
+ end
191
+
192
+ # Removes a key_alt_name from the key_alt_names array of the key document
193
+ # in the key vault collection with the given id.
194
+ def remove_key_alt_name(id, key_alt_name)
195
+ key_vault_collection.find_one_and_update(
196
+ { _id: id },
197
+ [
198
+ {
199
+ '$set' => {
200
+ keyAltNames: {
201
+ '$cond' => [
202
+ { '$eq' => [ '$keyAltNames', [ key_alt_name ] ] },
203
+ '$$REMOVE',
204
+ {
205
+ '$filter' => {
206
+ input: '$keyAltNames',
207
+ cond: { '$ne' => [ '$$this', key_alt_name ] }
208
+ }
209
+ }
210
+ ]
211
+ }
212
+ }
213
+ }
214
+ ]
215
+ )
216
+ end
217
+
218
+ # Apply given requests to the key vault collection using bulk write.
219
+ #
220
+ # @param [ Array<Hash> ] requests The bulk write requests.
221
+ #
222
+ # @return [ BulkWrite::Result ] The result of the operation.
223
+ def update_data_keys(updates)
224
+ key_vault_collection.bulk_write(updates)
225
+ end
226
+
157
227
  private
158
228
 
159
229
  def validate_key_vault_client!(key_vault_client)
@@ -242,6 +312,8 @@ module Mongo
242
312
  # Provide a TLS socket to be used for KMS calls in a block API
243
313
  #
244
314
  # @param [ String ] endpoint The URI at which to connect the TLS socket.
315
+ # @param [ Hash ] tls_options. TLS options to connect to KMS provider.
316
+ # The options are same as for Mongo::Client.
245
317
  # @yieldparam [ OpenSSL::SSL::SSLSocket ] ssl_socket Yields a TLS socket
246
318
  # connected to the specified endpoint.
247
319
  #
@@ -250,59 +322,21 @@ module Mongo
250
322
  #
251
323
  # @note The socket is always closed when the provided block has finished
252
324
  # executing
253
- def with_ssl_socket(endpoint)
254
- host, port = endpoint.split(':')
255
- port ||= 443 # Default port for AWS KMS API
256
-
257
- # Create TCPSocket and set nodelay option
258
- tcp_socket = TCPSocket.open(host, port)
259
- begin
260
- tcp_socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)
261
-
262
- ssl_socket = OpenSSL::SSL::SSLSocket.new(tcp_socket)
263
- begin
264
- # tcp_socket will be closed when ssl_socket is closed
265
- ssl_socket.sync_close = true
266
- # perform SNI
267
- ssl_socket.hostname = "#{host}:#{port}"
268
-
269
- Timeout.timeout(
270
- SOCKET_TIMEOUT,
271
- Error::SocketTimeoutError,
272
- "KMS socket connection timed out after #{SOCKET_TIMEOUT} seconds",
273
- ) do
274
- ssl_socket.connect
275
- end
276
-
277
- yield(ssl_socket)
278
- ensure
279
- begin
280
- Timeout.timeout(
281
- SOCKET_TIMEOUT,
282
- Error::SocketTimeoutError,
283
- 'KMS TLS socket close timed out'
284
- ) do
285
- ssl_socket.sysclose
286
- end
287
- rescue
288
- end
289
- end
290
- ensure
291
- # Still close tcp socket manually in case TLS socket creation
292
- # fails.
293
- begin
294
- Timeout.timeout(
295
- SOCKET_TIMEOUT,
296
- Error::SocketTimeoutError,
297
- 'KMS TCP socket close timed out'
298
- ) do
299
- tcp_socket.close
300
- end
301
- rescue
302
- end
325
+ def with_ssl_socket(endpoint, tls_options)
326
+ address = begin
327
+ host, port = endpoint.split(':')
328
+ port ||= 443 # All supported KMS APIs use this port by default.
329
+ Address.new([host, port].join(':'))
303
330
  end
331
+ mongo_socket = address.socket(
332
+ SOCKET_TIMEOUT,
333
+ tls_options.merge(ssl: true)
334
+ )
335
+ yield(mongo_socket.socket)
304
336
  rescue => e
305
- raise Error::KmsError, "Error decrypting data key: #{e.class}: #{e.message}"
337
+ raise Error::KmsError, "Error when connecting to KMS provider: #{e.class}: #{e.message}"
338
+ ensure
339
+ mongo_socket&.close
306
340
  end
307
341
  end
308
342
  end
@@ -29,15 +29,22 @@ module Mongo
29
29
  # to connect to the key vault collection.
30
30
  # @param [ String ] key_vault_namespace The namespace of the key vault
31
31
  # collection in the format "db_name.collection_name".
32
- # @option options [ Hash ] :kms_providers A hash of key management service
33
- # configuration information. Valid hash keys are :local or :aws. There
34
- # may be more than one KMS provider specified.
35
- def initialize(key_vault_client, key_vault_namespace, kms_providers)
36
- @crypt_handle = Handle.new(kms_providers)
37
-
32
+ # @param [ Crypt::KMS::Credentials ] kms_providers A hash of key management service
33
+ # configuration information.
34
+ # @param [ Hash ] kms_tls_options TLS options to connect to KMS
35
+ # providers. Keys of the hash should be KSM provider names; values
36
+ # should be hashes of TLS connection options. The options are equivalent
37
+ # to TLS connection options of Mongo::Client.
38
+ def initialize(key_vault_client, key_vault_namespace, kms_providers, kms_tls_options)
39
+ @crypt_handle = Handle.new(
40
+ kms_providers,
41
+ kms_tls_options,
42
+ explicit_encryption_only: true
43
+ )
38
44
  @encryption_io = EncryptionIO.new(
39
45
  key_vault_client: key_vault_client,
40
- key_vault_namespace: key_vault_namespace
46
+ metadata_client: nil,
47
+ key_vault_namespace: key_vault_namespace,
41
48
  )
42
49
  end
43
50
 
@@ -45,30 +52,24 @@ module Mongo
45
52
  # that key in the KMS collection. The generated key is encrypted with
46
53
  # the KMS master key.
47
54
  #
48
- # @param [ String ] kms_provider The KMS provider to use. Valid values are
49
- # "aws" and "local".
50
- # @param [ Hash ] options
51
- #
52
- # @option options [ Hash ] :master_key Information about the AWS master key. Required
53
- # if kms_provider is "aws".
54
- # - :region [ String ] The The AWS region of the master key (required).
55
- # - :key [ String ] The Amazon Resource Name (ARN) of the master key (required).
56
- # - :endpoint [ String ] An alternate host to send KMS requests to (optional).
57
- # endpoint should be a host name with an optional port number separated
58
- # by a colon (e.g. "kms.us-east-1.amazonaws.com" or
59
- # "kms.us-east-1.amazonaws.com:443"). An endpoint in any other format
60
- # will not be properly parsed.
61
- # @option options [ Array<String> ] :key_alt_names An optional array of strings specifying
55
+ # @param [ Mongo::Crypt::KMS::MasterKeyDocument ] master_key_document The master
56
+ # key document that contains master encryption key parameters.
57
+ # @param [ Array<String> | nil ] key_alt_names An optional array of strings specifying
62
58
  # alternate names for the new data key.
59
+ # @param [ String | nil ] key_material Optional 96 bytes to use as
60
+ # custom key material for the data key being created.
61
+ # If key_material option is given, the custom key material is used
62
+ # for encrypting and decrypting data.
63
63
  #
64
64
  # @return [ BSON::Binary ] The 16-byte UUID of the new data key as a
65
65
  # BSON::Binary object with type :uuid.
66
- def create_and_insert_data_key(kms_provider, options)
66
+ def create_and_insert_data_key(master_key_document, key_alt_names, key_material = nil)
67
67
  data_key_document = Crypt::DataKeyContext.new(
68
68
  @crypt_handle,
69
69
  @encryption_io,
70
- kms_provider,
71
- options
70
+ master_key_document,
71
+ key_alt_names,
72
+ key_material
72
73
  ).run_state_machine
73
74
 
74
75
  @encryption_io.insert_data_key(data_key_document).inserted_id
@@ -85,14 +86,24 @@ module Mongo
85
86
  # @option options [ String ] :key_alt_name The alternate name for the
86
87
  # encryption key.
87
88
  # @option options [ String ] :algorithm The algorithm used to encrypt the value.
88
- # Valid algorithms are "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
89
- # or "AEAD_AES_256_CBC_HMAC_SHA_512-Random".
89
+ # Valid algorithms are "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
90
+ # "AEAD_AES_256_CBC_HMAC_SHA_512-Random", "Indexed", "Unindexed".
91
+ # @option options [ Integer | nil ] :contention_factor Contention factor
92
+ # to be applied if encryption algorithm is set to "Indexed". If not
93
+ # provided, it defaults to a value of 0. Contention factor should be set
94
+ # only if encryption algorithm is set to "Indexed".
95
+ # @option options [ String | nil ] query_type Query type to be applied
96
+ # if encryption algorithm is set to "Indexed". Query type should be set
97
+ # only if encryption algorithm is set to "Indexed". The only allowed
98
+ # value is "equality".
90
99
  #
91
100
  # @note The :key_id and :key_alt_name options are mutually exclusive. Only
92
101
  # one is required to perform explicit encryption.
93
102
  #
94
103
  # @return [ BSON::Binary ] A BSON Binary object of subtype 6 (ciphertext)
95
104
  # representing the encrypted value
105
+ # @raise [ ArgumentError ] if either contention_factor or query_type
106
+ # is set, and algorithm is not "Indexed".
96
107
  def encrypt(value, options)
97
108
  Crypt::ExplicitEncryptionContext.new(
98
109
  @crypt_handle,
@@ -115,6 +126,112 @@ module Mongo
115
126
  { 'v': value },
116
127
  ).run_state_machine['v']
117
128
  end
129
+
130
+ # Adds a key_alt_name for the key in the key vault collection with the given id.
131
+ #
132
+ # @param [ BSON::Binary ] id Id of the key to add new key alt name.
133
+ # @param [ String ] key_alt_name New key alt name to add.
134
+ #
135
+ # @return [ BSON::Document | nil ] Document describing the identified key
136
+ # before adding the key alt name, or nil if no such key.
137
+ def add_key_alt_name(id, key_alt_name)
138
+ @encryption_io.add_key_alt_name(id, key_alt_name)
139
+ end
140
+
141
+ # Removes the key with the given id from the key vault collection.
142
+ #
143
+ # @param [ BSON::Binary ] id Id of the key to delete.
144
+ #
145
+ # @return [ Operation::Result ] The response from the database for the delete_one
146
+ # operation that deletes the key.
147
+ def delete_key(id)
148
+ @encryption_io.delete_key(id)
149
+ end
150
+
151
+ # Finds a single key with the given id.
152
+ #
153
+ # @param [ BSON::Binary ] id Id of the key to get.
154
+ #
155
+ # @return [ BSON::Document | nil ] The found key document or nil
156
+ # if not found.
157
+ def get_key(id)
158
+ @encryption_io.get_key(id)
159
+ end
160
+
161
+ # Returns a key in the key vault collection with the given key_alt_name.
162
+ #
163
+ # @param [ String ] key_alt_name Key alt name to find a key.
164
+ #
165
+ # @return [ BSON::Document | nil ] The found key document or nil
166
+ # if not found.
167
+ def get_key_by_alt_name(key_alt_name)
168
+ @encryption_io.get_key_by_alt_name(key_alt_name)
169
+ end
170
+
171
+ # Returns all keys in the key vault collection.
172
+ #
173
+ # @return [ Collection::View ] Keys in the key vault collection.
174
+ def get_keys
175
+ @encryption_io.get_keys
176
+ end
177
+
178
+ # Removes a key_alt_name from a key in the key vault collection with the given id.
179
+ #
180
+ # @param [ BSON::Binary ] id Id of the key to remove key alt name.
181
+ # @param [ String ] key_alt_name Key alt name to remove.
182
+ #
183
+ # @return [ BSON::Document | nil ] Document describing the identified key
184
+ # before removing the key alt name, or nil if no such key.
185
+ def remove_key_alt_name(id, key_alt_name)
186
+ @encryption_io.remove_key_alt_name(id, key_alt_name)
187
+ end
188
+
189
+ # Decrypts multiple data keys and (re-)encrypts them with a new master_key,
190
+ # or with their current master_key if a new one is not given.
191
+ #
192
+ # @param [ Hash ] filter Filter used to find keys to be updated.
193
+ # @param [ Hash ] options
194
+ #
195
+ # @option options [ String ] :provider KMS provider to encrypt keys.
196
+ # @option options [ Hash | nil ] :master_key Document describing master key
197
+ # to encrypt keys.
198
+ #
199
+ # @return [ Crypt::RewrapManyDataKeyResult ] Result of the operation.
200
+ def rewrap_many_data_key(filter, opts = {})
201
+ master_key_document = if opts[:provider]
202
+ options = opts.dup
203
+ provider = options.delete(:provider)
204
+ KMS::MasterKeyDocument.new(provider, options)
205
+ end
206
+
207
+ rewrap_result = Crypt::RewrapManyDataKeyContext.new(
208
+ @crypt_handle,
209
+ @encryption_io,
210
+ filter,
211
+ master_key_document
212
+ ).run_state_machine
213
+ if rewrap_result.nil?
214
+ return RewrapManyDataKeyResult.new(nil)
215
+ end
216
+ data_key_documents = rewrap_result.fetch('v')
217
+ updates = data_key_documents.map do |doc|
218
+ {
219
+ update_one: {
220
+ filter: { _id: doc[:_id] },
221
+ update: {
222
+ '$set' => {
223
+ masterKey: doc[:masterKey],
224
+ keyMaterial: doc[:keyMaterial]
225
+ },
226
+ '$currentDate' => { updateDate: true },
227
+ },
228
+ }
229
+ }
230
+ end
231
+ RewrapManyDataKeyResult.new(
232
+ @encryption_io.update_data_keys(updates)
233
+ )
234
+ end
118
235
  end
119
236
  end
120
237
  end
@@ -38,8 +38,16 @@ module Mongo
38
38
  # @option options [ String ] :key_alt_name The alternate name of the data key
39
39
  # that will be used to encrypt the value.
40
40
  # @option options [ String ] :algorithm The algorithm used to encrypt the
41
- # value. Valid algorithms are "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
42
- # or "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
41
+ # value. Valid algorithms are "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
42
+ # "AEAD_AES_256_CBC_HMAC_SHA_512-Random", "Indexed", "Unindexed".
43
+ # @option options [ Integer | nil ] :contention_factor Contention factor
44
+ # to be applied if encryption algorithm is set to "Indexed". If not
45
+ # provided, it defaults to a value of 0. Contention factor should be set
46
+ # only if encryption algorithm is set to "Indexed".
47
+ # @option options [ String | nil ] query_type Query type to be applied
48
+ # if encryption algorithm is set to "Indexed". Query type should be set
49
+ # only if encryption algorithm is set to "Indexed". The only allowed
50
+ # value is "equality".
43
51
  #
44
52
  # @raise [ ArgumentError|Mongo::Error::CryptError ] If invalid options are provided
45
53
  def initialize(mongocrypt, io, doc, options={})
@@ -82,6 +90,21 @@ module Mongo
82
90
  # Set the algorithm option on the mongocrypt_ctx_t object and raises
83
91
  # an exception if the algorithm is invalid.
84
92
  Binding.ctx_setopt_algorithm(self, options[:algorithm])
93
+ if options[:algorithm] == 'Indexed'
94
+ if options[:contention_factor]
95
+ Binding.ctx_setopt_contention_factor(self, options[:contention_factor])
96
+ end
97
+ if options[:query_type]
98
+ Binding.ctx_setopt_query_type(self, options[:query_type])
99
+ end
100
+ else
101
+ if options[:contention_factor]
102
+ raise ArgumentError.new(':contention_factor is allowed only for "Indexed" algorithm')
103
+ end
104
+ if options[:query_type]
105
+ raise ArgumentError.new(':query_type is allowed only for "Indexed" algorithm')
106
+ end
107
+ end
85
108
 
86
109
  # Initializes the mongocrypt_ctx_t object for explicit encryption and
87
110
  # passes in the value to be encrypted.