mongo 2.12.4 → 2.14.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data.tar.gz.sig +0 -0
- data/CONTRIBUTING.md +8 -36
- data/LICENSE +1 -1
- data/README.md +54 -54
- data/Rakefile +16 -10
- data/lib/mongo.rb +17 -3
- data/lib/mongo/active_support.rb +1 -1
- data/lib/mongo/address.rb +40 -13
- data/lib/mongo/address/ipv4.rb +32 -5
- data/lib/mongo/address/ipv6.rb +32 -5
- data/lib/mongo/address/unix.rb +3 -3
- data/lib/mongo/address/validator.rb +1 -1
- data/lib/mongo/auth.rb +36 -13
- data/lib/mongo/auth/aws.rb +37 -0
- data/lib/mongo/auth/aws/conversation.rb +128 -0
- data/lib/mongo/auth/aws/credentials_retriever.rb +219 -0
- data/lib/mongo/auth/aws/request.rb +283 -0
- data/lib/mongo/auth/base.rb +129 -0
- data/lib/mongo/auth/conversation_base.rb +52 -0
- data/lib/mongo/auth/cr.rb +9 -36
- data/lib/mongo/auth/cr/conversation.rb +24 -69
- data/lib/mongo/auth/credential_cache.rb +1 -1
- data/lib/mongo/auth/gssapi.rb +38 -0
- data/lib/mongo/auth/gssapi/conversation.rb +108 -0
- data/lib/mongo/auth/ldap.rb +9 -34
- data/lib/mongo/auth/ldap/conversation.rb +3 -43
- data/lib/mongo/auth/roles.rb +1 -1
- data/lib/mongo/auth/sasl_conversation_base.rb +111 -0
- data/lib/mongo/auth/scram.rb +39 -51
- data/lib/mongo/auth/scram/conversation.rb +12 -506
- data/lib/mongo/auth/scram256.rb +31 -0
- data/lib/mongo/auth/scram256/conversation.rb +63 -0
- data/lib/mongo/auth/scram_conversation_base.rb +402 -0
- data/lib/mongo/auth/stringprep.rb +5 -4
- data/lib/mongo/auth/stringprep/profiles/sasl.rb +2 -1
- data/lib/mongo/auth/stringprep/tables.rb +2 -1
- data/lib/mongo/auth/stringprep/unicode_normalize/normalize.rb +1 -0
- data/lib/mongo/auth/stringprep/unicode_normalize/tables.rb +1 -0
- data/lib/mongo/auth/user.rb +2 -2
- data/lib/mongo/auth/user/view.rb +1 -1
- data/lib/mongo/auth/x509.rb +14 -32
- data/lib/mongo/auth/x509/conversation.rb +15 -42
- data/lib/mongo/background_thread.rb +11 -2
- data/lib/mongo/bson.rb +1 -1
- data/lib/mongo/bulk_write.rb +79 -26
- data/lib/mongo/bulk_write/combineable.rb +20 -8
- data/lib/mongo/bulk_write/ordered_combiner.rb +1 -1
- data/lib/mongo/bulk_write/result.rb +1 -1
- data/lib/mongo/bulk_write/result_combiner.rb +1 -1
- data/lib/mongo/bulk_write/transformable.rb +9 -10
- data/lib/mongo/bulk_write/unordered_combiner.rb +1 -1
- data/lib/mongo/bulk_write/validatable.rb +5 -1
- data/lib/mongo/caching_cursor.rb +74 -0
- data/lib/mongo/client.rb +261 -39
- data/lib/mongo/client_encryption.rb +1 -1
- data/lib/mongo/cluster.rb +180 -72
- data/lib/mongo/cluster/periodic_executor.rb +1 -1
- data/lib/mongo/cluster/reapers/cursor_reaper.rb +1 -1
- data/lib/mongo/cluster/reapers/socket_reaper.rb +1 -1
- data/lib/mongo/cluster/sdam_flow.rb +36 -17
- data/lib/mongo/cluster/topology.rb +19 -2
- data/lib/mongo/cluster/topology/base.rb +1 -1
- data/lib/mongo/cluster/topology/no_replica_set_options.rb +1 -1
- data/lib/mongo/cluster/topology/replica_set_no_primary.rb +4 -3
- data/lib/mongo/cluster/topology/replica_set_with_primary.rb +1 -1
- data/lib/mongo/cluster/topology/sharded.rb +2 -2
- data/lib/mongo/cluster/topology/single.rb +3 -3
- data/lib/mongo/cluster/topology/unknown.rb +1 -1
- data/lib/mongo/cluster_time.rb +1 -1
- data/lib/mongo/collection.rb +77 -24
- data/lib/mongo/collection/view.rb +30 -22
- data/lib/mongo/collection/view/aggregation.rb +31 -7
- data/lib/mongo/collection/view/builder.rb +1 -1
- data/lib/mongo/collection/view/builder/aggregation.rb +1 -1
- data/lib/mongo/collection/view/builder/find_command.rb +47 -19
- data/lib/mongo/collection/view/builder/flags.rb +1 -1
- data/lib/mongo/collection/view/builder/map_reduce.rb +1 -1
- data/lib/mongo/collection/view/builder/modifiers.rb +1 -1
- data/lib/mongo/collection/view/builder/op_query.rb +1 -1
- data/lib/mongo/collection/view/change_stream.rb +3 -6
- data/lib/mongo/collection/view/change_stream/retryable.rb +1 -1
- data/lib/mongo/collection/view/explainable.rb +28 -9
- data/lib/mongo/collection/view/immutable.rb +1 -1
- data/lib/mongo/collection/view/iterable.rb +80 -14
- data/lib/mongo/collection/view/map_reduce.rb +7 -4
- data/lib/mongo/collection/view/readable.rb +22 -4
- data/lib/mongo/collection/view/writable.rb +107 -13
- data/lib/mongo/crypt.rb +1 -1
- data/lib/mongo/crypt/auto_decryption_context.rb +1 -1
- data/lib/mongo/crypt/auto_encrypter.rb +1 -1
- data/lib/mongo/crypt/auto_encryption_context.rb +1 -1
- data/lib/mongo/crypt/binary.rb +1 -1
- data/lib/mongo/crypt/binding.rb +1 -1
- data/lib/mongo/crypt/context.rb +1 -1
- data/lib/mongo/crypt/data_key_context.rb +1 -1
- data/lib/mongo/crypt/encryption_io.rb +45 -28
- data/lib/mongo/crypt/explicit_decryption_context.rb +1 -1
- data/lib/mongo/crypt/explicit_encrypter.rb +1 -1
- data/lib/mongo/crypt/explicit_encryption_context.rb +1 -1
- data/lib/mongo/crypt/handle.rb +1 -1
- data/lib/mongo/crypt/hooks.rb +1 -1
- data/lib/mongo/crypt/kms_context.rb +1 -1
- data/lib/mongo/crypt/status.rb +1 -1
- data/lib/mongo/cursor.rb +4 -3
- data/lib/mongo/cursor/builder.rb +1 -1
- data/lib/mongo/cursor/builder/get_more_command.rb +1 -1
- data/lib/mongo/cursor/builder/kill_cursors_command.rb +1 -1
- data/lib/mongo/cursor/builder/op_get_more.rb +1 -1
- data/lib/mongo/cursor/builder/op_kill_cursors.rb +1 -1
- data/lib/mongo/database.rb +41 -5
- data/lib/mongo/database/view.rb +21 -6
- data/lib/mongo/dbref.rb +1 -1
- data/lib/mongo/distinguishing_semaphore.rb +55 -0
- data/lib/mongo/error.rb +30 -2
- data/lib/mongo/error/auth_error.rb +1 -1
- data/lib/mongo/error/bulk_write_error.rb +1 -1
- data/lib/mongo/error/change_stream_resumable.rb +1 -1
- data/lib/mongo/error/closed_stream.rb +1 -1
- data/lib/mongo/error/connection_check_out_timeout.rb +1 -1
- data/lib/mongo/error/connection_perished.rb +23 -0
- data/lib/mongo/error/credential_check_error.rb +26 -0
- data/lib/mongo/error/extra_file_chunk.rb +1 -1
- data/lib/mongo/error/file_not_found.rb +1 -1
- data/lib/mongo/error/handshake_error.rb +1 -1
- data/lib/mongo/error/insufficient_iteration_count.rb +1 -1
- data/lib/mongo/error/invalid_address.rb +1 -1
- data/lib/mongo/error/invalid_application_name.rb +1 -1
- data/lib/mongo/error/invalid_bulk_operation.rb +1 -1
- data/lib/mongo/error/invalid_bulk_operation_type.rb +1 -1
- data/lib/mongo/error/invalid_collection_name.rb +1 -1
- data/lib/mongo/error/invalid_cursor_operation.rb +1 -1
- data/lib/mongo/error/invalid_database_name.rb +1 -1
- data/lib/mongo/error/invalid_document.rb +1 -1
- data/lib/mongo/error/invalid_file.rb +1 -1
- data/lib/mongo/error/invalid_file_revision.rb +1 -1
- data/lib/mongo/error/invalid_min_pool_size.rb +1 -1
- data/lib/mongo/error/invalid_nonce.rb +2 -2
- data/lib/mongo/error/invalid_read_concern.rb +28 -0
- data/lib/mongo/error/invalid_read_option.rb +1 -1
- data/lib/mongo/error/invalid_replacement_document.rb +1 -1
- data/lib/mongo/error/invalid_server_auth_host.rb +22 -0
- data/lib/mongo/error/invalid_server_auth_response.rb +23 -0
- data/lib/mongo/error/invalid_server_preference.rb +6 -1
- data/lib/mongo/error/invalid_session.rb +3 -2
- data/lib/mongo/error/invalid_signature.rb +1 -1
- data/lib/mongo/error/invalid_transaction_operation.rb +1 -1
- data/lib/mongo/error/invalid_txt_record.rb +1 -1
- data/lib/mongo/error/invalid_update_document.rb +1 -1
- data/lib/mongo/error/invalid_uri.rb +1 -1
- data/lib/mongo/error/invalid_write_concern.rb +1 -1
- data/lib/mongo/error/lint_error.rb +1 -1
- data/lib/mongo/error/max_bson_size.rb +1 -1
- data/lib/mongo/error/max_message_size.rb +1 -1
- data/lib/mongo/error/mismatched_domain.rb +1 -1
- data/lib/mongo/error/missing_file_chunk.rb +1 -1
- data/lib/mongo/error/missing_password.rb +1 -1
- data/lib/mongo/error/missing_resume_token.rb +1 -1
- data/lib/mongo/error/missing_scram_server_signature.rb +27 -0
- data/lib/mongo/error/multi_index_drop.rb +1 -1
- data/lib/mongo/error/need_primary_server.rb +1 -1
- data/lib/mongo/error/no_server_available.rb +1 -1
- data/lib/mongo/error/no_srv_records.rb +1 -1
- data/lib/mongo/error/notable.rb +18 -3
- data/lib/mongo/error/operation_failure.rb +63 -44
- data/lib/mongo/error/parser.rb +16 -5
- data/lib/mongo/error/pool_closed_error.rb +1 -1
- data/lib/mongo/error/raise_original_error.rb +29 -0
- data/lib/mongo/error/server_certificate_revoked.rb +22 -0
- data/lib/mongo/error/session_ended.rb +1 -1
- data/lib/mongo/error/sessions_not_supported.rb +35 -0
- data/lib/mongo/error/socket_error.rb +1 -1
- data/lib/mongo/error/socket_timeout_error.rb +1 -1
- data/lib/mongo/error/unchangeable_collection_option.rb +1 -1
- data/lib/mongo/error/unexpected_chunk_length.rb +1 -1
- data/lib/mongo/error/unexpected_response.rb +1 -1
- data/lib/mongo/error/unknown_payload_type.rb +1 -1
- data/lib/mongo/error/unsupported_array_filters.rb +7 -2
- data/lib/mongo/error/unsupported_collation.rb +7 -2
- data/lib/mongo/error/unsupported_features.rb +1 -1
- data/lib/mongo/error/unsupported_message_type.rb +1 -1
- data/lib/mongo/error/unsupported_option.rb +101 -0
- data/lib/mongo/error/write_retryable.rb +1 -1
- data/lib/mongo/event.rb +1 -1
- data/lib/mongo/event/base.rb +7 -1
- data/lib/mongo/event/listeners.rb +1 -1
- data/lib/mongo/event/publisher.rb +1 -1
- data/lib/mongo/event/subscriber.rb +1 -1
- data/lib/mongo/grid.rb +1 -1
- data/lib/mongo/grid/file.rb +1 -1
- data/lib/mongo/grid/file/chunk.rb +1 -1
- data/lib/mongo/grid/file/info.rb +1 -1
- data/lib/mongo/grid/fs_bucket.rb +9 -4
- data/lib/mongo/grid/stream.rb +1 -1
- data/lib/mongo/grid/stream/read.rb +1 -1
- data/lib/mongo/grid/stream/write.rb +1 -1
- data/lib/mongo/id.rb +1 -1
- data/lib/mongo/index.rb +2 -1
- data/lib/mongo/index/view.rb +61 -11
- data/lib/mongo/lint.rb +11 -0
- data/lib/mongo/loggable.rb +1 -1
- data/lib/mongo/logger.rb +4 -4
- data/lib/mongo/monitoring.rb +39 -1
- data/lib/mongo/monitoring/cmap_log_subscriber.rb +1 -1
- data/lib/mongo/monitoring/command_log_subscriber.rb +20 -5
- data/lib/mongo/monitoring/event.rb +1 -1
- data/lib/mongo/monitoring/event/cmap.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/base.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/connection_check_out_failed.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/connection_check_out_started.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/connection_checked_in.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/connection_checked_out.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/connection_closed.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/connection_created.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/connection_ready.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/pool_cleared.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/pool_closed.rb +1 -1
- data/lib/mongo/monitoring/event/cmap/pool_created.rb +1 -1
- data/lib/mongo/monitoring/event/command_failed.rb +12 -1
- data/lib/mongo/monitoring/event/command_started.rb +44 -3
- data/lib/mongo/monitoring/event/command_succeeded.rb +12 -1
- data/lib/mongo/monitoring/event/secure.rb +8 -2
- data/lib/mongo/monitoring/event/server_closed.rb +2 -2
- data/lib/mongo/monitoring/event/server_description_changed.rb +28 -5
- data/lib/mongo/monitoring/event/server_heartbeat_failed.rb +10 -3
- data/lib/mongo/monitoring/event/server_heartbeat_started.rb +10 -3
- data/lib/mongo/monitoring/event/server_heartbeat_succeeded.rb +10 -3
- data/lib/mongo/monitoring/event/server_opening.rb +2 -2
- data/lib/mongo/monitoring/event/topology_changed.rb +2 -2
- data/lib/mongo/monitoring/event/topology_closed.rb +2 -2
- data/lib/mongo/monitoring/event/topology_opening.rb +2 -2
- data/lib/mongo/monitoring/publishable.rb +9 -9
- data/lib/mongo/monitoring/sdam_log_subscriber.rb +1 -1
- data/lib/mongo/monitoring/server_closed_log_subscriber.rb +1 -1
- data/lib/mongo/monitoring/server_description_changed_log_subscriber.rb +10 -2
- data/lib/mongo/monitoring/server_opening_log_subscriber.rb +1 -1
- data/lib/mongo/monitoring/topology_changed_log_subscriber.rb +2 -2
- data/lib/mongo/monitoring/topology_closed_log_subscriber.rb +1 -1
- data/lib/mongo/monitoring/topology_opening_log_subscriber.rb +1 -1
- data/lib/mongo/monitoring/unified_sdam_log_subscriber.rb +1 -1
- data/lib/mongo/operation.rb +3 -0
- data/lib/mongo/operation/aggregate.rb +1 -1
- data/lib/mongo/operation/aggregate/command.rb +5 -5
- data/lib/mongo/operation/aggregate/op_msg.rb +1 -1
- data/lib/mongo/operation/aggregate/result.rb +10 -9
- data/lib/mongo/operation/collections_info.rb +3 -36
- data/lib/mongo/operation/collections_info/command.rb +40 -0
- data/lib/mongo/operation/collections_info/result.rb +3 -1
- data/lib/mongo/operation/command.rb +1 -1
- data/lib/mongo/operation/command/command.rb +3 -3
- data/lib/mongo/operation/command/op_msg.rb +1 -1
- data/lib/mongo/operation/count.rb +1 -1
- data/lib/mongo/operation/count/command.rb +3 -3
- data/lib/mongo/operation/count/op_msg.rb +1 -1
- data/lib/mongo/operation/create.rb +1 -1
- data/lib/mongo/operation/create/command.rb +3 -3
- data/lib/mongo/operation/create/op_msg.rb +1 -1
- data/lib/mongo/operation/create_index.rb +1 -1
- data/lib/mongo/operation/create_index/command.rb +4 -4
- data/lib/mongo/operation/create_index/op_msg.rb +6 -3
- data/lib/mongo/operation/create_user.rb +1 -1
- data/lib/mongo/operation/create_user/command.rb +4 -4
- data/lib/mongo/operation/create_user/op_msg.rb +2 -2
- data/lib/mongo/operation/delete.rb +1 -1
- data/lib/mongo/operation/delete/bulk_result.rb +3 -1
- data/lib/mongo/operation/delete/command.rb +4 -4
- data/lib/mongo/operation/delete/legacy.rb +2 -2
- data/lib/mongo/operation/delete/op_msg.rb +4 -4
- data/lib/mongo/operation/delete/result.rb +5 -2
- data/lib/mongo/operation/distinct.rb +1 -1
- data/lib/mongo/operation/distinct/command.rb +3 -3
- data/lib/mongo/operation/distinct/op_msg.rb +1 -1
- data/lib/mongo/operation/drop.rb +1 -1
- data/lib/mongo/operation/drop/command.rb +3 -3
- data/lib/mongo/operation/drop/op_msg.rb +1 -1
- data/lib/mongo/operation/drop_database.rb +1 -1
- data/lib/mongo/operation/drop_database/command.rb +3 -3
- data/lib/mongo/operation/drop_database/op_msg.rb +1 -1
- data/lib/mongo/operation/drop_index.rb +1 -1
- data/lib/mongo/operation/drop_index/command.rb +4 -4
- data/lib/mongo/operation/drop_index/op_msg.rb +2 -2
- data/lib/mongo/operation/explain.rb +1 -1
- data/lib/mongo/operation/explain/command.rb +7 -3
- data/lib/mongo/operation/explain/legacy.rb +7 -3
- data/lib/mongo/operation/explain/op_msg.rb +7 -1
- data/lib/mongo/operation/explain/result.rb +4 -1
- data/lib/mongo/operation/find.rb +1 -1
- data/lib/mongo/operation/find/command.rb +3 -3
- data/lib/mongo/operation/find/legacy.rb +3 -3
- data/lib/mongo/operation/find/legacy/result.rb +3 -1
- data/lib/mongo/operation/find/op_msg.rb +2 -12
- data/lib/mongo/operation/find/result.rb +4 -1
- data/lib/mongo/operation/get_more.rb +1 -1
- data/lib/mongo/operation/get_more/command.rb +3 -3
- data/lib/mongo/operation/get_more/legacy.rb +2 -2
- data/lib/mongo/operation/get_more/op_msg.rb +2 -12
- data/lib/mongo/operation/get_more/result.rb +4 -1
- data/lib/mongo/operation/indexes.rb +1 -1
- data/lib/mongo/operation/indexes/command.rb +3 -3
- data/lib/mongo/operation/indexes/legacy.rb +4 -4
- data/lib/mongo/operation/indexes/op_msg.rb +1 -1
- data/lib/mongo/operation/indexes/result.rb +6 -1
- data/lib/mongo/operation/insert.rb +3 -2
- data/lib/mongo/operation/insert/bulk_result.rb +11 -2
- data/lib/mongo/operation/insert/command.rb +7 -7
- data/lib/mongo/operation/insert/legacy.rb +9 -5
- data/lib/mongo/operation/insert/op_msg.rb +6 -6
- data/lib/mongo/operation/insert/result.rb +12 -4
- data/lib/mongo/operation/kill_cursors.rb +1 -1
- data/lib/mongo/operation/kill_cursors/command.rb +3 -3
- data/lib/mongo/operation/kill_cursors/legacy.rb +2 -2
- data/lib/mongo/operation/kill_cursors/op_msg.rb +1 -1
- data/lib/mongo/operation/list_collections.rb +1 -1
- data/lib/mongo/operation/list_collections/command.rb +4 -4
- data/lib/mongo/operation/list_collections/op_msg.rb +2 -2
- data/lib/mongo/operation/list_collections/result.rb +6 -1
- data/lib/mongo/operation/map_reduce.rb +1 -1
- data/lib/mongo/operation/map_reduce/command.rb +3 -3
- data/lib/mongo/operation/map_reduce/op_msg.rb +1 -1
- data/lib/mongo/operation/map_reduce/result.rb +11 -1
- data/lib/mongo/operation/op_msg_base.rb +3 -3
- data/lib/mongo/operation/parallel_scan.rb +1 -1
- data/lib/mongo/operation/parallel_scan/command.rb +5 -5
- data/lib/mongo/operation/parallel_scan/op_msg.rb +2 -2
- data/lib/mongo/operation/parallel_scan/result.rb +5 -1
- data/lib/mongo/operation/remove_user.rb +1 -1
- data/lib/mongo/operation/remove_user/command.rb +4 -4
- data/lib/mongo/operation/remove_user/op_msg.rb +2 -2
- data/lib/mongo/operation/result.rb +63 -10
- data/lib/mongo/operation/shared/bypass_document_validation.rb +11 -4
- data/lib/mongo/operation/shared/causal_consistency_supported.rb +4 -3
- data/lib/mongo/operation/shared/collections_info_or_list_collections.rb +58 -0
- data/lib/mongo/operation/shared/executable.rb +47 -28
- data/lib/mongo/operation/shared/executable_no_validate.rb +3 -3
- data/lib/mongo/operation/shared/executable_transaction_label.rb +1 -1
- data/lib/mongo/operation/shared/idable.rb +3 -2
- data/lib/mongo/operation/shared/limited.rb +11 -2
- data/lib/mongo/operation/shared/object_id_generator.rb +2 -1
- data/lib/mongo/operation/shared/op_msg_or_command.rb +7 -5
- data/lib/mongo/operation/shared/op_msg_or_find_command.rb +8 -6
- data/lib/mongo/operation/shared/op_msg_or_list_indexes_command.rb +8 -6
- data/lib/mongo/operation/shared/polymorphic_lookup.rb +1 -1
- data/lib/mongo/operation/shared/polymorphic_result.rb +1 -1
- data/lib/mongo/operation/shared/read_preference_supported.rb +19 -16
- data/lib/mongo/operation/shared/response_handling.rb +83 -8
- data/lib/mongo/operation/shared/result/aggregatable.rb +2 -1
- data/lib/mongo/operation/shared/result/use_legacy_error_parser.rb +1 -1
- data/lib/mongo/operation/shared/sessions_supported.rb +51 -27
- data/lib/mongo/operation/shared/specifiable.rb +33 -20
- data/lib/mongo/operation/shared/write.rb +26 -19
- data/lib/mongo/operation/shared/write_concern_supported.rb +7 -6
- data/lib/mongo/operation/update.rb +1 -1
- data/lib/mongo/operation/update/bulk_result.rb +1 -1
- data/lib/mongo/operation/update/command.rb +4 -4
- data/lib/mongo/operation/update/legacy.rb +2 -2
- data/lib/mongo/operation/update/legacy/result.rb +8 -1
- data/lib/mongo/operation/update/op_msg.rb +4 -4
- data/lib/mongo/operation/update/result.rb +10 -2
- data/lib/mongo/operation/update_user.rb +1 -1
- data/lib/mongo/operation/update_user/command.rb +4 -4
- data/lib/mongo/operation/update_user/op_msg.rb +2 -2
- data/lib/mongo/operation/users_info.rb +1 -1
- data/lib/mongo/operation/users_info/command.rb +4 -4
- data/lib/mongo/operation/users_info/op_msg.rb +2 -2
- data/lib/mongo/operation/users_info/result.rb +4 -1
- data/lib/mongo/options.rb +1 -1
- data/lib/mongo/options/mapper.rb +1 -1
- data/lib/mongo/options/redacted.rb +1 -1
- data/lib/mongo/protocol/bit_vector.rb +1 -1
- data/lib/mongo/protocol/compressed.rb +1 -1
- data/lib/mongo/protocol/delete.rb +1 -1
- data/lib/mongo/protocol/get_more.rb +1 -1
- data/lib/mongo/protocol/insert.rb +1 -1
- data/lib/mongo/protocol/kill_cursors.rb +1 -1
- data/lib/mongo/protocol/message.rb +35 -7
- data/lib/mongo/protocol/msg.rb +18 -4
- data/lib/mongo/protocol/query.rb +1 -1
- data/lib/mongo/protocol/registry.rb +1 -1
- data/lib/mongo/protocol/reply.rb +1 -1
- data/lib/mongo/protocol/serializers.rb +1 -1
- data/lib/mongo/protocol/update.rb +1 -1
- data/lib/mongo/query_cache.rb +242 -0
- data/lib/mongo/retryable.rb +31 -11
- data/lib/mongo/semaphore.rb +1 -1
- data/lib/mongo/server.rb +45 -9
- data/lib/mongo/server/app_metadata.rb +44 -7
- data/lib/mongo/server/connection.rb +37 -133
- data/lib/mongo/server/connection_base.rb +22 -7
- data/lib/mongo/server/connection_common.rb +75 -1
- data/lib/mongo/server/connection_pool.rb +23 -1
- data/lib/mongo/server/connection_pool/populator.rb +1 -1
- data/lib/mongo/server/context.rb +1 -1
- data/lib/mongo/server/description.rb +49 -2
- data/lib/mongo/server/description/features.rb +12 -3
- data/lib/mongo/server/monitor.rb +145 -69
- data/lib/mongo/server/monitor/app_metadata.rb +1 -1
- data/lib/mongo/server/monitor/connection.rb +110 -80
- data/lib/mongo/server/pending_connection.rb +215 -3
- data/lib/mongo/server/push_monitor.rb +173 -0
- data/{spec/runners/transactions/context.rb → lib/mongo/server/push_monitor/connection.rb} +9 -14
- data/lib/mongo/server/round_trip_time_averager.rb +12 -3
- data/lib/mongo/server_selector.rb +2 -2
- data/lib/mongo/server_selector/{selectable.rb → base.rb} +164 -87
- data/lib/mongo/server_selector/nearest.rb +26 -21
- data/lib/mongo/server_selector/primary.rb +24 -28
- data/lib/mongo/server_selector/primary_preferred.rb +32 -25
- data/lib/mongo/server_selector/secondary.rb +26 -21
- data/lib/mongo/server_selector/secondary_preferred.rb +29 -34
- data/lib/mongo/session.rb +17 -1
- data/lib/mongo/session/server_session.rb +1 -1
- data/lib/mongo/session/session_pool.rb +1 -1
- data/lib/mongo/socket.rb +127 -45
- data/lib/mongo/socket/ocsp_cache.rb +97 -0
- data/lib/mongo/socket/ocsp_verifier.rb +368 -0
- data/lib/mongo/socket/ssl.rb +141 -57
- data/lib/mongo/socket/tcp.rb +39 -31
- data/lib/mongo/socket/unix.rb +14 -6
- data/lib/mongo/srv.rb +1 -1
- data/lib/mongo/srv/monitor.rb +8 -14
- data/lib/mongo/srv/resolver.rb +15 -11
- data/lib/mongo/srv/result.rb +1 -1
- data/lib/mongo/timeout.rb +11 -9
- data/lib/mongo/topology_version.rb +89 -0
- data/lib/mongo/uri.rb +52 -407
- data/lib/mongo/uri/options_mapper.rb +582 -0
- data/lib/mongo/uri/srv_protocol.rb +12 -3
- data/lib/mongo/utils.rb +73 -0
- data/lib/mongo/version.rb +2 -2
- data/lib/mongo/write_concern.rb +1 -1
- data/lib/mongo/write_concern/acknowledged.rb +1 -1
- data/lib/mongo/write_concern/base.rb +1 -1
- data/lib/mongo/write_concern/unacknowledged.rb +1 -1
- data/mongo.gemspec +1 -1
- data/spec/NOTES.aws-auth.md +296 -0
- data/spec/README.aws-auth.md +318 -0
- data/spec/README.md +120 -18
- data/spec/integration/auth_spec.rb +29 -9
- data/spec/integration/awaited_ismaster_spec.rb +28 -0
- data/spec/integration/aws_auth_request_spec.rb +74 -0
- data/spec/integration/aws_credentials_retriever_spec.rb +103 -0
- data/spec/integration/bulk_write_spec.rb +48 -0
- data/spec/integration/change_stream_examples_spec.rb +6 -2
- data/spec/integration/change_stream_spec.rb +123 -51
- data/spec/integration/check_clean_slate_spec.rb +16 -0
- data/spec/integration/client_authentication_options_spec.rb +55 -28
- data/spec/integration/client_construction_aws_auth_spec.rb +191 -0
- data/spec/integration/client_construction_spec.rb +2 -1
- data/spec/integration/collection_indexes_prose_spec.rb +55 -0
- data/spec/integration/command_monitoring_spec.rb +30 -6
- data/spec/integration/command_spec.rb +11 -9
- data/spec/integration/connect_single_rs_name_spec.rb +10 -5
- data/spec/integration/connection_pool_populator_spec.rb +3 -1
- data/spec/integration/connection_spec.rb +7 -3
- data/spec/integration/crud_spec.rb +32 -4
- data/spec/integration/cursor_reaping_spec.rb +67 -27
- data/spec/integration/docs_examples_spec.rb +6 -0
- data/spec/integration/fork_reconnect_spec.rb +143 -0
- data/spec/integration/get_more_spec.rb +10 -3
- data/spec/integration/heartbeat_events_spec.rb +5 -24
- data/spec/integration/ocsp_connectivity_spec.rb +26 -0
- data/spec/integration/ocsp_verifier_cache_spec.rb +188 -0
- data/spec/integration/ocsp_verifier_spec.rb +334 -0
- data/spec/integration/query_cache_spec.rb +1045 -0
- data/spec/integration/query_cache_transactions_spec.rb +179 -0
- data/spec/integration/read_concern_spec.rb +1 -1
- data/spec/integration/read_preference_spec.rb +41 -11
- data/spec/integration/reconnect_spec.rb +2 -3
- data/spec/integration/retryable_errors_spec.rb +33 -14
- data/spec/integration/{retryable_writes_spec.rb → retryable_writes/retryable_writes_36_and_older_spec.rb} +55 -51
- data/spec/integration/retryable_writes/retryable_writes_40_and_newer_spec.rb +402 -0
- data/spec/integration/retryable_writes/shared/adds_diagnostics.rb +15 -0
- data/spec/integration/retryable_writes/shared/does_not_support_retries.rb +24 -0
- data/spec/integration/retryable_writes/shared/only_supports_legacy_retries.rb +25 -0
- data/spec/integration/retryable_writes/shared/performs_legacy_retries.rb +217 -0
- data/spec/integration/retryable_writes/shared/performs_modern_retries.rb +232 -0
- data/spec/integration/retryable_writes/shared/performs_no_retries.rb +110 -0
- data/spec/integration/retryable_writes/shared/supports_legacy_retries.rb +19 -0
- data/spec/integration/retryable_writes/shared/supports_modern_retries.rb +25 -0
- data/spec/integration/retryable_writes/shared/supports_retries.rb +16 -0
- data/spec/integration/sdam_error_handling_spec.rb +210 -22
- data/spec/integration/sdam_events_spec.rb +77 -5
- data/spec/integration/sdam_prose_spec.rb +64 -0
- data/spec/integration/server_monitor_spec.rb +25 -1
- data/spec/integration/server_selection_spec.rb +36 -0
- data/spec/integration/server_spec.rb +42 -26
- data/spec/integration/size_limit_spec.rb +3 -3
- data/spec/integration/srv_monitoring_spec.rb +38 -3
- data/spec/integration/srv_spec.rb +56 -0
- data/spec/integration/ssl_uri_options_spec.rb +2 -2
- data/spec/integration/step_down_spec.rb +15 -15
- data/spec/integration/transactions_api_examples_spec.rb +59 -0
- data/spec/integration/transactions_examples_spec.rb +5 -2
- data/spec/integration/x509_auth_spec.rb +109 -0
- data/spec/kerberos/kerberos_spec.rb +10 -6
- data/spec/lite_spec_helper.rb +34 -23
- data/spec/mongo/address/ipv4_spec.rb +1 -1
- data/spec/mongo/address_spec.rb +3 -3
- data/spec/mongo/auth/aws/request_region_spec.rb +42 -0
- data/spec/mongo/auth/aws/request_spec.rb +76 -0
- data/spec/mongo/auth/cr_spec.rb +7 -7
- data/spec/mongo/auth/gssapi/conversation_spec.rb +121 -0
- data/spec/mongo/auth/invalid_mechanism_spec.rb +1 -1
- data/spec/mongo/auth/ldap/conversation_spec.rb +1 -1
- data/spec/mongo/auth/ldap_spec.rb +3 -3
- data/spec/mongo/auth/scram/conversation_spec.rb +119 -334
- data/spec/mongo/auth/scram256/conversation_spec.rb +171 -0
- data/spec/mongo/auth/{scram/negotiation_spec.rb → scram_negotiation_spec.rb} +13 -8
- data/spec/mongo/auth/scram_spec.rb +29 -69
- data/spec/mongo/auth/user_spec.rb +1 -1
- data/spec/mongo/auth/x509/conversation_spec.rb +1 -1
- data/spec/mongo/auth/x509_spec.rb +8 -8
- data/spec/mongo/auth_spec.rb +4 -4
- data/spec/mongo/bulk_write_spec.rb +206 -2
- data/spec/mongo/caching_cursor_spec.rb +70 -0
- data/spec/mongo/client_construction_spec.rb +674 -87
- data/spec/mongo/client_spec.rb +99 -5
- data/spec/mongo/cluster/topology/replica_set_spec.rb +52 -9
- data/spec/mongo/cluster/topology/single_spec.rb +18 -7
- data/spec/mongo/cluster_spec.rb +40 -36
- data/spec/mongo/collection/view/aggregation_spec.rb +6 -2
- data/spec/mongo/collection/view/builder/find_command_spec.rb +17 -6
- data/spec/mongo/collection/view/change_stream_resume_spec.rb +392 -0
- data/spec/mongo/collection/view/change_stream_spec.rb +0 -318
- data/spec/mongo/collection/view/explainable_spec.rb +87 -4
- data/spec/mongo/collection/view/iterable_spec.rb +38 -0
- data/spec/mongo/collection/view/map_reduce_spec.rb +8 -2
- data/spec/mongo/collection/view/readable_spec.rb +15 -1
- data/spec/mongo/collection/view/writable_spec.rb +208 -1
- data/spec/mongo/collection_spec.rb +567 -43
- data/spec/mongo/crypt/auto_decryption_context_spec.rb +1 -1
- data/spec/mongo/crypt/auto_encryption_context_spec.rb +1 -1
- data/spec/mongo/crypt/explicit_decryption_context_spec.rb +1 -1
- data/spec/mongo/crypt/explicit_encryption_context_spec.rb +1 -1
- data/spec/mongo/cursor/builder/get_more_command_spec.rb +6 -1
- data/spec/mongo/cursor/builder/op_get_more_spec.rb +6 -1
- data/spec/mongo/cursor/builder/op_kill_cursors_spec.rb +6 -1
- data/spec/mongo/cursor_spec.rb +9 -1
- data/spec/mongo/database_spec.rb +295 -10
- data/spec/mongo/distinguishing_semaphore_spec.rb +63 -0
- data/spec/mongo/error/no_server_available_spec.rb +1 -1
- data/spec/mongo/error/operation_failure_heavy_spec.rb +58 -0
- data/spec/mongo/error/operation_failure_spec.rb +167 -69
- data/spec/mongo/error/unsupported_option_spec.rb +54 -0
- data/spec/mongo/grid/fs_bucket_spec.rb +18 -0
- data/spec/mongo/grid/stream/write_spec.rb +32 -0
- data/spec/mongo/index/view_spec.rb +312 -0
- data/spec/mongo/logger_spec.rb +13 -11
- data/spec/mongo/monitoring/event/server_description_changed_spec.rb +1 -4
- data/spec/mongo/operation/aggregate/result_spec.rb +6 -1
- data/spec/mongo/operation/delete/bulk_spec.rb +18 -6
- data/spec/mongo/operation/delete/op_msg_spec.rb +22 -14
- data/spec/mongo/operation/find/legacy_spec.rb +27 -7
- data/spec/mongo/operation/get_more_spec.rb +6 -1
- data/spec/mongo/operation/insert/bulk_spec.rb +21 -7
- data/spec/mongo/operation/insert/command_spec.rb +4 -0
- data/spec/mongo/operation/insert/op_msg_spec.rb +22 -14
- data/spec/mongo/operation/limited_spec.rb +5 -3
- data/spec/mongo/operation/read_preference_legacy_spec.rb +16 -4
- data/spec/mongo/operation/read_preference_op_msg_spec.rb +115 -5
- data/spec/mongo/operation/result_spec.rb +6 -1
- data/spec/mongo/operation/update/bulk_spec.rb +18 -6
- data/spec/mongo/operation/update/command_spec.rb +4 -0
- data/spec/mongo/operation/update/op_msg_spec.rb +22 -14
- data/spec/mongo/protocol/msg_spec.rb +10 -0
- data/spec/mongo/query_cache_spec.rb +279 -0
- data/spec/mongo/retryable_spec.rb +71 -70
- data/spec/mongo/semaphore_spec.rb +51 -0
- data/spec/mongo/server/app_metadata_shared.rb +136 -0
- data/spec/mongo/server/app_metadata_spec.rb +8 -1
- data/spec/mongo/server/connection_auth_spec.rb +33 -14
- data/spec/mongo/server/connection_pool_spec.rb +7 -34
- data/spec/mongo/server/connection_spec.rb +131 -77
- data/spec/mongo/server/monitor/app_metadata_spec.rb +8 -1
- data/spec/mongo/server/monitor/connection_spec.rb +1 -82
- data/spec/mongo/server/monitor_spec.rb +76 -17
- data/spec/mongo/server/round_trip_time_averager_spec.rb +5 -3
- data/spec/mongo/server_selector/nearest_spec.rb +24 -23
- data/spec/mongo/server_selector/primary_preferred_spec.rb +27 -26
- data/spec/mongo/server_selector/primary_spec.rb +27 -9
- data/spec/mongo/server_selector/secondary_preferred_spec.rb +40 -23
- data/spec/mongo/server_selector/secondary_spec.rb +19 -18
- data/spec/mongo/server_selector_spec.rb +4 -5
- data/spec/mongo/session/session_pool_spec.rb +7 -3
- data/spec/mongo/session_spec.rb +35 -0
- data/spec/mongo/socket/ssl_spec.rb +3 -3
- data/spec/mongo/socket/tcp_spec.rb +2 -2
- data/spec/mongo/socket/unix_spec.rb +2 -2
- data/spec/mongo/socket_spec.rb +10 -10
- data/spec/mongo/timeout_spec.rb +22 -68
- data/spec/mongo/uri/srv_protocol_spec.rb +64 -33
- data/spec/mongo/uri_option_parsing_spec.rb +11 -11
- data/spec/mongo/uri_spec.rb +85 -43
- data/spec/mongo/utils_spec.rb +39 -0
- data/spec/runners/auth.rb +8 -6
- data/spec/runners/change_streams/outcome.rb +42 -0
- data/spec/runners/change_streams/spec.rb +57 -0
- data/spec/runners/change_streams/test.rb +229 -0
- data/spec/runners/cmap.rb +1 -1
- data/spec/runners/cmap/verifier.rb +1 -1
- data/spec/runners/command_monitoring.rb +4 -35
- data/spec/runners/connection_string.rb +36 -124
- data/spec/runners/crud.rb +2 -2
- data/spec/runners/crud/context.rb +10 -6
- data/spec/runners/crud/operation.rb +177 -55
- data/spec/runners/crud/outcome.rb +1 -1
- data/spec/runners/crud/spec.rb +0 -7
- data/spec/runners/crud/test.rb +8 -26
- data/spec/runners/crud/test_base.rb +47 -0
- data/spec/runners/crud/verifier.rb +21 -3
- data/spec/runners/gridfs.rb +1 -1
- data/spec/runners/{server_discovery_and_monitoring.rb → sdam.rb} +41 -22
- data/spec/runners/sdam/verifier.rb +26 -8
- data/spec/runners/server_selection.rb +242 -28
- data/spec/runners/transactions.rb +13 -14
- data/spec/runners/transactions/operation.rb +155 -25
- data/spec/runners/transactions/spec.rb +1 -1
- data/spec/runners/transactions/test.rb +103 -65
- data/spec/spec_tests/auth_spec.rb +2 -0
- data/spec/spec_tests/change_streams_spec.rb +39 -4
- data/spec/spec_tests/client_side_encryption_spec.rb +3 -0
- data/spec/spec_tests/cmap_spec.rb +12 -3
- data/spec/spec_tests/command_monitoring_spec.rb +25 -12
- data/spec/spec_tests/connection_string_spec.rb +2 -0
- data/spec/spec_tests/crud_spec.rb +3 -1
- data/spec/spec_tests/data/auth/connection-string.yml +57 -1
- data/spec/spec_tests/data/change_streams/change-streams-errors.yml +27 -2
- data/spec/spec_tests/data/change_streams/change-streams-resume-errorLabels.yml +1105 -0
- data/spec/spec_tests/data/change_streams/change-streams-resume-whitelist.yml +1173 -0
- data/spec/spec_tests/data/change_streams/change-streams.yml +5 -5
- data/spec/spec_tests/data/cmap/pool-checkout-connection.yml +6 -2
- data/spec/spec_tests/data/cmap/pool-create-min-size.yml +3 -0
- data/spec/spec_tests/data/connection_string/valid-warnings.yml +24 -0
- data/spec/spec_tests/data/crud_v2/aggregate-merge.yml +1 -1
- data/spec/spec_tests/data/crud_v2/bulkWrite-arrayFilters.yml +33 -11
- data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint-clientError.yml +63 -0
- data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint-serverError.yml +92 -0
- data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint.yml +103 -0
- data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint-clientError.yml +90 -0
- data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint-serverError.yml +147 -0
- data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint.yml +164 -0
- data/spec/spec_tests/data/crud_v2/deleteMany-hint-clientError.yml +43 -0
- data/spec/spec_tests/data/crud_v2/deleteMany-hint-serverError.yml +62 -0
- data/spec/spec_tests/data/crud_v2/deleteMany-hint.yml +58 -0
- data/spec/spec_tests/data/crud_v2/deleteOne-hint-clientError.yml +41 -0
- data/spec/spec_tests/data/crud_v2/deleteOne-hint-serverError.yml +60 -0
- data/spec/spec_tests/data/crud_v2/deleteOne-hint.yml +57 -0
- data/spec/spec_tests/data/crud_v2/find-allowdiskuse-clientError.yml +28 -0
- data/spec/spec_tests/data/crud_v2/find-allowdiskuse-serverError.yml +44 -0
- data/spec/spec_tests/data/crud_v2/find-allowdiskuse.yml +50 -0
- data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint-clientError.yml +45 -0
- data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint-serverError.yml +60 -0
- data/spec/spec_tests/data/crud_v2/findOneAndDelete-hint.yml +56 -0
- data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint-clientError.yml +40 -0
- data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint-serverError.yml +59 -0
- data/spec/spec_tests/data/crud_v2/findOneAndReplace-hint.yml +55 -0
- data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint-clientError.yml +40 -0
- data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint-serverError.yml +58 -0
- data/spec/spec_tests/data/crud_v2/findOneAndUpdate-hint.yml +55 -0
- data/spec/spec_tests/data/crud_v2/replaceOne-hint.yml +61 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-bulkWrite-delete-hint-clientError.yml +60 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-bulkWrite-update-hint-clientError.yml +88 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-deleteMany-hint-clientError.yml +40 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-deleteOne-hint-clientError.yml +38 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndDelete-hint-clientError.yml +42 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndReplace-hint-clientError.yml +40 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-findOneAndUpdate-hint-clientError.yml +40 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-replaceOne-hint-clientError.yml +40 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-updateMany-hint-clientError.yml +43 -0
- data/spec/spec_tests/data/crud_v2/unacknowledged-updateOne-hint-clientError.yml +40 -0
- data/spec/spec_tests/data/crud_v2/updateMany-hint-clientError.yml +45 -0
- data/spec/spec_tests/data/crud_v2/updateMany-hint-serverError.yml +66 -0
- data/spec/spec_tests/data/crud_v2/updateMany-hint.yml +65 -0
- data/spec/spec_tests/data/crud_v2/updateOne-hint-clientError.yml +43 -0
- data/spec/spec_tests/data/crud_v2/updateOne-hint-serverError.yml +62 -0
- data/spec/spec_tests/data/crud_v2/updateOne-hint.yml +61 -0
- data/spec/spec_tests/data/crud_v2/updateWithPipelines.yml +65 -0
- data/spec/spec_tests/data/dns_seedlist_discovery/direct-connection-false.yml +10 -0
- data/spec/spec_tests/data/dns_seedlist_discovery/direct-connection-true.yml +5 -0
- data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml +15 -0
- data/spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/NoKnownServers.yml +4 -3
- data/spec/spec_tests/data/max_staleness/Unknown/SmallMaxStaleness.yml +1 -0
- data/spec/spec_tests/data/read_write_concern/operation/default-write-concern-2.6.yml +215 -0
- data/spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.2.yml +58 -0
- data/spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.4.yml +95 -0
- data/spec/spec_tests/data/read_write_concern/operation/default-write-concern-4.2.yml +36 -0
- data/spec/spec_tests/data/retryable_writes/bulkWrite-errorLabels.yml +77 -0
- data/spec/spec_tests/data/retryable_writes/bulkWrite-serverErrors.yml +37 -0
- data/spec/spec_tests/data/retryable_writes/deleteOne-errorLabels.yml +48 -0
- data/spec/spec_tests/data/retryable_writes/deleteOne-serverErrors.yml +22 -0
- data/spec/spec_tests/data/retryable_writes/findOneAndDelete-errorLabels.yml +49 -0
- data/spec/spec_tests/data/retryable_writes/findOneAndDelete-serverErrors.yml +23 -0
- data/spec/spec_tests/data/retryable_writes/findOneAndReplace-errorLabels.yml +52 -0
- data/spec/spec_tests/data/retryable_writes/findOneAndReplace-serverErrors.yml +25 -0
- data/spec/spec_tests/data/retryable_writes/findOneAndUpdate-errorLabels.yml +52 -0
- data/spec/spec_tests/data/retryable_writes/findOneAndUpdate-serverErrors.yml +24 -0
- data/spec/spec_tests/data/retryable_writes/insertMany-errorLabels.yml +54 -0
- data/spec/spec_tests/data/retryable_writes/insertMany-serverErrors.yml +24 -0
- data/spec/spec_tests/data/retryable_writes/insertOne-errorLabels.yml +44 -0
- data/spec/spec_tests/data/retryable_writes/insertOne-serverErrors.yml +69 -0
- data/spec/spec_tests/data/retryable_writes/replaceOne-errorLabels.yml +53 -0
- data/spec/spec_tests/data/retryable_writes/replaceOne-serverErrors.yml +23 -0
- data/spec/spec_tests/data/retryable_writes/updateOne-errorLabels.yml +53 -0
- data/spec/spec_tests/data/retryable_writes/updateOne-serverErrors.yml +23 -0
- data/spec/spec_tests/data/sdam/errors/error_handling_handshake.yml +54 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-network-error.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-network-timeout-error.yml +37 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotMaster.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotMasterNoSlaveOk.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotMasterOrSecondary.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml +51 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml +51 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotMaster.yml +51 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotMasterNoSlaveOk.yml +51 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotMasterOrSecondary.yml +51 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml +51 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml +51 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotMaster.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotMasterNoSlaveOk.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotMasterOrSecondary.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml +60 -0
- data/spec/spec_tests/data/sdam/errors/post-42-InterruptedAtShutdown.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/post-42-InterruptedDueToReplStateChange.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/post-42-NotMaster.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/post-42-NotMasterNoSlaveOk.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/post-42-NotMasterOrSecondary.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/post-42-PrimarySteppedDown.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/post-42-ShutdownInProgress.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/pre-42-InterruptedAtShutdown.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/pre-42-InterruptedDueToReplStateChange.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/pre-42-NotMaster.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/pre-42-NotMasterNoSlaveOk.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/pre-42-NotMasterOrSecondary.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/pre-42-PrimarySteppedDown.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/pre-42-ShutdownInProgress.yml +46 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-InterruptedAtShutdown.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-InterruptedDueToReplStateChange.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-NotMaster.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-NotMasterNoSlaveOk.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-NotMasterOrSecondary.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-PrimarySteppedDown.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-ShutdownInProgress.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotMaster.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotMasterNoSlaveOk.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotMasterOrSecondary.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-network.yml +80 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-timeout.yml +80 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotMaster.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotMasterNoSlaveOk.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotMasterOrSecondary.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml +89 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-network.yml +80 -0
- data/spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-timeout.yml +80 -0
- data/spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedAtShutdown.yml +64 -0
- data/spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml +64 -0
- data/spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotMaster.yml +64 -0
- data/spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotMasterNoSlaveOk.yml +64 -0
- data/spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotMasterOrSecondary.yml +64 -0
- data/spec/spec_tests/data/sdam/errors/stale-topologyVersion-PrimarySteppedDown.yml +64 -0
- data/spec/spec_tests/data/sdam/errors/stale-topologyVersion-ShutdownInProgress.yml +64 -0
- data/spec/spec_tests/data/sdam/rs/compatible.yml +2 -0
- data/spec/spec_tests/data/sdam/rs/compatible_unknown.yml +2 -0
- data/spec/spec_tests/data/sdam/rs/discover_arbiters.yml +2 -2
- data/spec/spec_tests/data/sdam/rs/discover_arbiters_replicaset.yml +43 -0
- data/spec/spec_tests/data/sdam/rs/discover_ghost.yml +35 -0
- data/spec/spec_tests/data/sdam/rs/{ghost_discovered.yml → discover_ghost_replicaset.yml} +1 -1
- data/spec/spec_tests/data/sdam/rs/discover_hidden.yml +50 -0
- data/spec/spec_tests/data/sdam/rs/discover_hidden_replicaset.yml +50 -0
- data/spec/spec_tests/data/sdam/rs/discover_passives.yml +2 -2
- data/spec/spec_tests/data/sdam/rs/discover_passives_replicaset.yml +81 -0
- data/spec/spec_tests/data/sdam/rs/discover_primary.yml +2 -2
- data/spec/spec_tests/data/sdam/rs/discover_primary_replicaset.yml +42 -0
- data/spec/spec_tests/data/sdam/rs/discover_rsother.yml +49 -0
- data/spec/spec_tests/data/sdam/rs/{rsother_discovered.yml → discover_rsother_replicaset.yml} +1 -1
- data/spec/spec_tests/data/sdam/rs/discover_secondary.yml +2 -2
- data/spec/spec_tests/data/sdam/rs/discover_secondary_replicaset.yml +43 -0
- data/spec/spec_tests/data/sdam/rs/incompatible_arbiter.yml +2 -0
- data/spec/spec_tests/data/sdam/rs/incompatible_ghost.yml +2 -0
- data/spec/spec_tests/data/sdam/rs/incompatible_other.yml +2 -0
- data/spec/spec_tests/data/sdam/rs/primary_mismatched_me.yml +23 -27
- data/spec/spec_tests/data/sdam/rs/primary_to_no_primary_mismatched_me.yml +79 -55
- data/spec/spec_tests/data/sdam/rs/replicaset_rsnp.yml +20 -0
- data/spec/spec_tests/data/sdam/rs/secondary_mismatched_me.yml +3 -2
- data/spec/spec_tests/data/sdam/rs/too_new.yml +2 -0
- data/spec/spec_tests/data/sdam/rs/topology_version_equal.yml +66 -0
- data/spec/spec_tests/data/sdam/rs/topology_version_greater.yml +189 -0
- data/spec/spec_tests/data/sdam/rs/topology_version_less.yml +62 -0
- data/spec/spec_tests/data/sdam/sharded/discover_single_mongos.yml +23 -0
- data/spec/spec_tests/data/sdam/single/direct_connection_external_ip.yml +1 -1
- data/spec/spec_tests/data/sdam/single/direct_connection_mongos.yml +2 -2
- data/spec/spec_tests/data/sdam/single/direct_connection_replicaset.yml +22 -0
- data/spec/spec_tests/data/sdam/single/direct_connection_rsarbiter.yml +2 -2
- data/spec/spec_tests/data/sdam/single/direct_connection_rsprimary.yml +2 -2
- data/spec/spec_tests/data/sdam/single/direct_connection_rssecondary.yml +2 -2
- data/spec/spec_tests/data/sdam/single/direct_connection_slave.yml +1 -1
- data/spec/spec_tests/data/sdam/single/direct_connection_standalone.yml +2 -2
- data/spec/spec_tests/data/sdam/single/{unavailable_seed.yml → direct_connection_unavailable_seed.yml} +2 -2
- data/spec/spec_tests/data/sdam/single/direct_connection_wrong_set_name.yml +38 -0
- data/spec/spec_tests/data/sdam/single/discover_standalone.yml +34 -0
- data/spec/spec_tests/data/sdam/single/discover_unavailable_seed.yml +28 -0
- data/spec/spec_tests/data/sdam/single/too_old_then_upgraded.yml +46 -0
- data/spec/spec_tests/data/sdam_integration/cancel-server-check.yml +96 -0
- data/spec/spec_tests/data/sdam_integration/connectTimeoutMS.yml +88 -0
- data/spec/spec_tests/data/sdam_integration/find-network-error.yml +83 -0
- data/spec/spec_tests/data/sdam_integration/find-shutdown-error.yml +116 -0
- data/spec/spec_tests/data/sdam_integration/insert-network-error.yml +86 -0
- data/spec/spec_tests/data/sdam_integration/insert-shutdown-error.yml +115 -0
- data/spec/spec_tests/data/sdam_integration/isMaster-command-error.yml +168 -0
- data/spec/spec_tests/data/sdam_integration/isMaster-network-error.yml +162 -0
- data/spec/spec_tests/data/sdam_integration/isMaster-timeout.yml +229 -0
- data/spec/spec_tests/data/sdam_integration/rediscover-quickly-after-step-down.yml +87 -0
- data/spec/spec_tests/data/sdam_monitoring/discovered_standalone.yml +1 -3
- data/spec/spec_tests/data/sdam_monitoring/standalone.yml +2 -2
- data/spec/spec_tests/data/sdam_monitoring/standalone_repeated.yml +2 -2
- data/spec/spec_tests/data/sdam_monitoring/standalone_suppress_equal_description_changes.yml +2 -2
- data/spec/spec_tests/data/sdam_monitoring/standalone_to_rs_with_me_mismatch.yml +2 -2
- data/spec/spec_tests/data/transactions/create-collection.yml +131 -0
- data/spec/spec_tests/data/transactions/create-index.yml +152 -0
- data/spec/spec_tests/data/transactions/error-labels.yml +87 -21
- data/spec/spec_tests/data/transactions/mongos-recovery-token.yml +1 -0
- data/spec/spec_tests/data/transactions/retryable-abort-errorLabels.yml +124 -0
- data/spec/spec_tests/data/transactions/retryable-abort.yml +17 -2
- data/spec/spec_tests/data/transactions/retryable-commit-errorLabels.yml +132 -0
- data/spec/spec_tests/data/transactions/retryable-commit.yml +24 -9
- data/spec/spec_tests/data/uri_options/auth-options.yml +25 -0
- data/spec/spec_tests/data/uri_options/compression-options.yml +6 -3
- data/spec/spec_tests/data/uri_options/connection-options.yml +43 -0
- data/spec/spec_tests/data/uri_options/read-preference-options.yml +24 -0
- data/spec/spec_tests/data/uri_options/ruby-auth-options.yml +12 -0
- data/spec/spec_tests/data/uri_options/ruby-connection-options.yml +58 -0
- data/spec/spec_tests/data/uri_options/tls-options.yml +160 -4
- data/spec/spec_tests/dns_seedlist_discovery_spec.rb +12 -2
- data/spec/spec_tests/gridfs_spec.rb +2 -0
- data/spec/spec_tests/max_staleness_spec.rb +5 -141
- data/spec/spec_tests/read_write_concern_connection_string_spec.rb +2 -0
- data/spec/spec_tests/read_write_concern_operaton_spec.rb +10 -0
- data/spec/spec_tests/retryable_reads_spec.rb +4 -2
- data/spec/spec_tests/retryable_writes_spec.rb +8 -1
- data/spec/spec_tests/sdam_integration_spec.rb +13 -0
- data/spec/spec_tests/sdam_monitoring_spec.rb +3 -2
- data/spec/spec_tests/sdam_spec.rb +70 -1
- data/spec/spec_tests/server_selection_rtt_spec.rb +2 -0
- data/spec/spec_tests/server_selection_spec.rb +5 -115
- data/spec/spec_tests/transactions_api_spec.rb +5 -0
- data/spec/spec_tests/transactions_spec.rb +5 -0
- data/spec/spec_tests/uri_options_spec.rb +33 -33
- data/spec/stress/cleanup_spec.rb +58 -0
- data/spec/stress/connection_pool_stress_spec.rb +11 -13
- data/spec/stress/connection_pool_timing_spec.rb +3 -6
- data/spec/stress/fork_reconnect_stress_spec.rb +109 -0
- data/spec/support/authorization.rb +1 -11
- data/spec/support/aws_utils.rb +62 -0
- data/spec/support/aws_utils/base.rb +134 -0
- data/spec/support/aws_utils/inspector.rb +224 -0
- data/spec/support/aws_utils/orchestrator.rb +370 -0
- data/spec/support/aws_utils/provisioner.rb +360 -0
- data/spec/support/background_thread_registry.rb +6 -2
- data/spec/support/certificates/atlas-ocsp-ca.crt +28 -0
- data/spec/support/certificates/atlas-ocsp.crt +41 -0
- data/spec/support/child_process_helper.rb +78 -0
- data/spec/support/client_registry.rb +6 -24
- data/spec/support/client_registry_macros.rb +11 -2
- data/spec/support/cluster_config.rb +5 -0
- data/spec/support/common_shortcuts.rb +88 -0
- data/spec/support/constraints.rb +50 -7
- data/spec/support/crypt.rb +1 -1
- data/spec/support/event_subscriber.rb +184 -84
- data/spec/support/keyword_struct.rb +26 -0
- data/spec/support/lite_constraints.rb +71 -0
- data/spec/support/matchers.rb +16 -0
- data/spec/support/ocsp +1 -0
- data/spec/support/session_registry.rb +52 -0
- data/spec/support/shared/scram_conversation.rb +100 -0
- data/spec/support/shared/server_selector.rb +93 -1
- data/spec/support/shared/session.rb +29 -21
- data/spec/support/spec_config.rb +98 -21
- data/spec/support/spec_organizer.rb +129 -0
- data/spec/support/spec_setup.rb +9 -5
- data/spec/support/utils.rb +180 -25
- metadata +1221 -745
- metadata.gz.sig +0 -0
- data/lib/mongo/server/connectable.rb +0 -107
- data/spec/runners/change_streams.rb +0 -262
- data/spec/runners/change_streams/operation.rb +0 -89
- data/spec/runners/sdam_monitoring.rb +0 -89
- data/spec/spec_tests/data/sdam/sharded/ruby_discovered_single_mongos.yml +0 -27
data/lib/mongo/srv/resolver.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (C) 2017-
|
1
|
+
# Copyright (C) 2017-2020 MongoDB Inc.
|
2
2
|
#
|
3
3
|
# Licensed under the Apache License, Version 2.0 (the 'License');
|
4
4
|
# you may not use this file except in compliance with the License.
|
@@ -28,20 +28,24 @@ module Mongo
|
|
28
28
|
|
29
29
|
# Creates a new Resolver.
|
30
30
|
#
|
31
|
-
# @
|
32
|
-
#
|
33
|
-
# @option
|
31
|
+
# @option opts [ Float ] :timeout The timeout, in seconds, to use for
|
32
|
+
# each DNS record resolution.
|
33
|
+
# @option opts [ Boolean ] :raise_on_invalid Whether or not to raise
|
34
34
|
# an exception if either a record with a mismatched domain is found
|
35
35
|
# or if no records are found. Defaults to true.
|
36
|
-
# @option
|
36
|
+
# @option opts [ Hash ] :resolv_options For internal driver use only.
|
37
37
|
# Options to pass through to Resolv::DNS constructor for SRV lookups.
|
38
|
-
def initialize(
|
39
|
-
@options =
|
40
|
-
options.dup
|
41
|
-
else
|
42
|
-
{}
|
43
|
-
end.freeze
|
38
|
+
def initialize(**opts)
|
39
|
+
@options = opts.freeze
|
44
40
|
@resolver = Resolv::DNS.new(@options[:resolv_options])
|
41
|
+
@resolver.timeouts = timeout
|
42
|
+
end
|
43
|
+
|
44
|
+
# @return [ Hash ] Resolver options.
|
45
|
+
attr_reader :options
|
46
|
+
|
47
|
+
def timeout
|
48
|
+
options[:timeout] || Monitor::DEFAULT_TIMEOUT
|
45
49
|
end
|
46
50
|
|
47
51
|
# Obtains all of the SRV records for a given hostname.
|
data/lib/mongo/srv/result.rb
CHANGED
data/lib/mongo/timeout.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (C) 2020 MongoDB
|
1
|
+
# Copyright (C) 2020 MongoDB Inc.
|
2
2
|
#
|
3
3
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
4
4
|
# you may not use this file except in compliance with the License.
|
@@ -13,6 +13,8 @@
|
|
13
13
|
# limitations under the License.
|
14
14
|
|
15
15
|
module Mongo
|
16
|
+
|
17
|
+
# @api private
|
16
18
|
module Timeout
|
17
19
|
|
18
20
|
# A wrapper around Ruby core's Timeout::timeout method that provides
|
@@ -24,15 +26,15 @@ module Mongo
|
|
24
26
|
# When no error exception is provided, Timeout::Error is raised.
|
25
27
|
# @param [ String ] message The error message passed to the exception raised
|
26
28
|
# on timeout, optional. When no error message is provided, the default
|
27
|
-
# error message is
|
28
|
-
#
|
29
|
-
# @note Ruby versions older than 2.4.0 do not support specifying a custom
|
30
|
-
# error message, and any error message passed in as an argument will be
|
31
|
-
# ignored.
|
29
|
+
# error message for the exception class is used.
|
32
30
|
def timeout(sec, klass=nil, message=nil)
|
33
|
-
if RUBY_VERSION < '2.
|
34
|
-
|
35
|
-
|
31
|
+
if message && RUBY_VERSION < '2.94.0'
|
32
|
+
begin
|
33
|
+
::Timeout.timeout(sec) do
|
34
|
+
yield
|
35
|
+
end
|
36
|
+
rescue ::Timeout::Error => e
|
37
|
+
raise klass, message
|
36
38
|
end
|
37
39
|
else
|
38
40
|
# Jruby Timeout::timeout method does not support passing nil arguments.
|
@@ -0,0 +1,89 @@
|
|
1
|
+
# Copyright (C) 2020 MongoDB Inc.
|
2
|
+
#
|
3
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
4
|
+
# you may not use this file except in compliance with the License.
|
5
|
+
# You may obtain a copy of the License at
|
6
|
+
#
|
7
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
8
|
+
#
|
9
|
+
# Unless required by applicable law or agreed to in writing, software
|
10
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
11
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
12
|
+
# See the License for the specific language governing permissions and
|
13
|
+
# limitations under the License.
|
14
|
+
|
15
|
+
module Mongo
|
16
|
+
# TopologyVersion encapsulates the topologyVersion document obtained from
|
17
|
+
# ismaster responses and not master-like OperationFailure errors.
|
18
|
+
#
|
19
|
+
# @api private
|
20
|
+
class TopologyVersion < BSON::Document
|
21
|
+
def initialize(doc)
|
22
|
+
if Lint.enabled?
|
23
|
+
unless doc['processId']
|
24
|
+
raise ArgumentError, 'Creating a topology version without processId field'
|
25
|
+
end
|
26
|
+
unless doc['counter']
|
27
|
+
raise ArgumentError, 'Creating a topology version without counter field'
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
super
|
32
|
+
end
|
33
|
+
|
34
|
+
# @return [ BSON::ObjectId ] The process id.
|
35
|
+
def process_id
|
36
|
+
self['processId']
|
37
|
+
end
|
38
|
+
|
39
|
+
# @return [ Integer ] The counter.
|
40
|
+
def counter
|
41
|
+
self['counter']
|
42
|
+
end
|
43
|
+
|
44
|
+
# Returns whether this topology version is potentially newer than another
|
45
|
+
# topology version.
|
46
|
+
#
|
47
|
+
# Note that there is no total ordering of topology versions - given
|
48
|
+
# two topology versions, each may be "potentially newer" than the other one.
|
49
|
+
#
|
50
|
+
# @param [ TopologyVersion ] other The other topology version.
|
51
|
+
#
|
52
|
+
# @return [ true | false ] Whether this topology version is potentially newer.
|
53
|
+
# @api private
|
54
|
+
def gt?(other)
|
55
|
+
if process_id != other.process_id
|
56
|
+
true
|
57
|
+
else
|
58
|
+
counter > other.counter
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
# Returns whether this topology version is potentially newer than or equal
|
63
|
+
# to another topology version.
|
64
|
+
#
|
65
|
+
# Note that there is no total ordering of topology versions - given
|
66
|
+
# two topology versions, each may be "potentially newer" than the other one.
|
67
|
+
#
|
68
|
+
# @param [ TopologyVersion ] other The other topology version.
|
69
|
+
#
|
70
|
+
# @return [ true | false ] Whether this topology version is potentially newer.
|
71
|
+
# @api private
|
72
|
+
def gte?(other)
|
73
|
+
if process_id != other.process_id
|
74
|
+
true
|
75
|
+
else
|
76
|
+
counter >= other.counter
|
77
|
+
end
|
78
|
+
end
|
79
|
+
|
80
|
+
# Converts the object to a document suitable for being sent to the server.
|
81
|
+
#
|
82
|
+
# @return [ BSON::Document ] The document.
|
83
|
+
#
|
84
|
+
# @api private
|
85
|
+
def to_doc
|
86
|
+
BSON::Document.new(self).merge(counter: BSON::Int64.new(counter))
|
87
|
+
end
|
88
|
+
end
|
89
|
+
end
|
data/lib/mongo/uri.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright (C) 2014-
|
1
|
+
# Copyright (C) 2014-2020 MongoDB Inc.
|
2
2
|
#
|
3
3
|
# Licensed under the Apache License, Version 2.0 (the 'License');
|
4
4
|
# you may not use this file except in compliance with the License.
|
@@ -192,12 +192,13 @@ module Mongo
|
|
192
192
|
# @since 2.0.0
|
193
193
|
AUTH_MECH_MAP = {
|
194
194
|
'GSSAPI' => :gssapi,
|
195
|
+
'MONGODB-AWS' => :aws,
|
195
196
|
# MONGODB-CR is deprecated and will be removed in driver version 3.0
|
196
197
|
'MONGODB-CR' => :mongodb_cr,
|
197
198
|
'MONGODB-X509' => :mongodb_x509,
|
198
199
|
'PLAIN' => :plain,
|
199
200
|
'SCRAM-SHA-1' => :scram,
|
200
|
-
'SCRAM-SHA-256' => :scram256
|
201
|
+
'SCRAM-SHA-256' => :scram256,
|
201
202
|
}.freeze
|
202
203
|
|
203
204
|
# Options that are allowed to appear more than once in the uri.
|
@@ -295,42 +296,7 @@ module Mongo
|
|
295
296
|
raise_invalid_error!('No hosts in the URI')
|
296
297
|
end
|
297
298
|
parse!(remaining)
|
298
|
-
|
299
|
-
# The URI options spec requires that we raise an error if there are conflicting values of
|
300
|
-
# 'tls' and 'ssl'. In order to fulfill this, we parse the values of each instance into an
|
301
|
-
# array; assuming all values in the array are the same, we replace the array with that value.
|
302
|
-
unless @uri_options[:ssl].nil? || @uri_options[:ssl].empty?
|
303
|
-
unless @uri_options[:ssl].uniq.length == 1
|
304
|
-
raise_invalid_error_no_fmt!("all instances of 'tls' and 'ssl' must have the same value")
|
305
|
-
end
|
306
|
-
|
307
|
-
@uri_options[:ssl] = @uri_options[:ssl].first
|
308
|
-
end
|
309
|
-
|
310
|
-
# Check for conflicting TLS insecure options.
|
311
|
-
unless @uri_options[:ssl_verify].nil?
|
312
|
-
unless @uri_options[:ssl_verify_certificate].nil?
|
313
|
-
raise_invalid_error_no_fmt!("'tlsInsecure' and 'tlsAllowInvalidCertificates' cannot both be specified")
|
314
|
-
end
|
315
|
-
|
316
|
-
unless @uri_options[:ssl_verify_hostname].nil?
|
317
|
-
raise_invalid_error_no_fmt!("tlsInsecure' and 'tlsAllowInvalidHostnames' cannot both be specified")
|
318
|
-
end
|
319
|
-
end
|
320
|
-
|
321
|
-
# Since we know that the only URI option that sets :ssl_cert is "tlsCertificateKeyFile", any
|
322
|
-
# value set for :ssl_cert must also be set for :ssl_key.
|
323
|
-
if @uri_options[:ssl_cert]
|
324
|
-
@uri_options[:ssl_key] = @uri_options[:ssl_cert]
|
325
|
-
end
|
326
|
-
|
327
|
-
if uri_options[:write_concern] && !uri_options[:write_concern].empty?
|
328
|
-
begin
|
329
|
-
WriteConcern.get(uri_options[:write_concern])
|
330
|
-
rescue Error::InvalidWriteConcern => e
|
331
|
-
raise_invalid_error_no_fmt!("#{e.class}: #{e}")
|
332
|
-
end
|
333
|
-
end
|
299
|
+
validate_uri_options!
|
334
300
|
end
|
335
301
|
|
336
302
|
# Get the credentials provided in the URI.
|
@@ -422,6 +388,12 @@ module Mongo
|
|
422
388
|
[ creds_hosts, db_opts ].map { |s| s.reverse }
|
423
389
|
end
|
424
390
|
|
391
|
+
def options_mapper
|
392
|
+
@options_mapper ||= OptionsMapper.new(
|
393
|
+
logger: @options[:logger],
|
394
|
+
)
|
395
|
+
end
|
396
|
+
|
425
397
|
def parse_uri_options!(string)
|
426
398
|
uri_options = {}
|
427
399
|
unless string
|
@@ -435,12 +407,9 @@ module Mongo
|
|
435
407
|
if value.nil?
|
436
408
|
raise_invalid_error!("Option #{key} has no value")
|
437
409
|
end
|
438
|
-
if value.index('=')
|
439
|
-
raise_invalid_error!("Value for option #{key} contains the key/value delimiter (=): #{value}")
|
440
|
-
end
|
441
410
|
key = decode(key)
|
442
411
|
value = decode(value)
|
443
|
-
add_uri_option(key, value, uri_options)
|
412
|
+
options_mapper.add_uri_option(key, value, uri_options)
|
444
413
|
end
|
445
414
|
uri_options
|
446
415
|
end
|
@@ -487,394 +456,70 @@ module Mongo
|
|
487
456
|
end
|
488
457
|
|
489
458
|
def encode(value)
|
490
|
-
|
491
|
-
end
|
492
|
-
|
493
|
-
# Hash for storing map of URI option parameters to conversion strategies
|
494
|
-
URI_OPTION_MAP = {}
|
495
|
-
|
496
|
-
# Simple internal dsl to register a MongoDB URI option in the URI_OPTION_MAP.
|
497
|
-
#
|
498
|
-
# @param uri_key [String] The MongoDB URI option to register.
|
499
|
-
# @param name [Symbol] The name of the option in the driver.
|
500
|
-
# @param extra [Hash] Extra options.
|
501
|
-
# * :group [Symbol] Nested hash where option will go.
|
502
|
-
# * :type [Symbol] Name of function to transform value.
|
503
|
-
def self.uri_option(uri_key, name, extra = {})
|
504
|
-
URI_OPTION_MAP[uri_key] = { :name => name }.merge(extra)
|
459
|
+
CGI.escape(value).gsub('+', '%20')
|
505
460
|
end
|
506
461
|
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
uri_option 'localthresholdms', :local_threshold, :type => :ms
|
515
|
-
uri_option 'heartbeatfrequencyms', :heartbeat_frequency, :type => :ms
|
516
|
-
uri_option 'maxidletimems', :max_idle_time, :type => :ms
|
517
|
-
|
518
|
-
# Write Options
|
519
|
-
uri_option 'w', :w, :group => :write_concern, type: :w
|
520
|
-
uri_option 'journal', :j, :group => :write_concern, :type => :bool
|
521
|
-
uri_option 'fsync', :fsync, :group => :write_concern, type: :bool
|
522
|
-
uri_option 'wtimeoutms', :wtimeout, :group => :write_concern, :type => :integer
|
523
|
-
|
524
|
-
# Read Options
|
525
|
-
uri_option 'readpreference', :mode, :group => :read, :type => :read_mode
|
526
|
-
uri_option 'readpreferencetags', :tag_sets, :group => :read, :type => :read_tags
|
527
|
-
uri_option 'maxstalenessseconds', :max_staleness, :group => :read, :type => :max_staleness
|
528
|
-
|
529
|
-
# Pool options
|
530
|
-
uri_option 'minpoolsize', :min_pool_size, :type => :integer
|
531
|
-
uri_option 'maxpoolsize', :max_pool_size, :type => :integer
|
532
|
-
uri_option 'waitqueuetimeoutms', :wait_queue_timeout, :type => :ms
|
533
|
-
|
534
|
-
# Security Options
|
535
|
-
uri_option 'ssl', :ssl, :type => :repeated_bool
|
536
|
-
uri_option 'tls', :ssl, :type => :repeated_bool
|
537
|
-
uri_option 'tlsallowinvalidcertificates', :ssl_verify_certificate,
|
538
|
-
:type => :inverse_bool
|
539
|
-
uri_option 'tlsallowinvalidhostnames', :ssl_verify_hostname,
|
540
|
-
:type => :inverse_bool
|
541
|
-
uri_option 'tlscafile', :ssl_ca_cert
|
542
|
-
uri_option 'tlscertificatekeyfile', :ssl_cert
|
543
|
-
uri_option 'tlscertificatekeyfilepassword', :ssl_key_pass_phrase
|
544
|
-
uri_option 'tlsinsecure', :ssl_verify, :type => :inverse_bool
|
545
|
-
|
546
|
-
# Topology options
|
547
|
-
uri_option 'connect', :connect, type: :symbol
|
548
|
-
|
549
|
-
# Auth Options
|
550
|
-
uri_option 'authsource', :auth_source
|
551
|
-
uri_option 'authmechanism', :auth_mech, :type => :auth_mech
|
552
|
-
uri_option 'authmechanismproperties', :auth_mech_properties, :type => :auth_mech_props
|
553
|
-
|
554
|
-
# Client Options
|
555
|
-
uri_option 'appname', :app_name
|
556
|
-
uri_option 'compressors', :compressors, :type => :array
|
557
|
-
uri_option 'readconcernlevel', :level, group: :read_concern, type: :symbol
|
558
|
-
uri_option 'retryreads', :retry_reads, :type => :bool
|
559
|
-
uri_option 'retrywrites', :retry_writes, :type => :bool
|
560
|
-
uri_option 'zlibcompressionlevel', :zlib_compression_level, :type => :zlib_compression_level
|
561
|
-
|
562
|
-
# Applies URI value transformation by either using the default cast
|
563
|
-
# or a transformation appropriate for the given type.
|
564
|
-
#
|
565
|
-
# @param key [String] URI option name.
|
566
|
-
# @param value [String] The value to be transformed.
|
567
|
-
# @param type [Symbol] The transform method.
|
568
|
-
def apply_transform(key, value, type)
|
569
|
-
if type
|
570
|
-
if respond_to?("convert_#{type}", true)
|
571
|
-
send("convert_#{type}", key, value)
|
572
|
-
else
|
573
|
-
send(type, value)
|
462
|
+
def validate_uri_options!
|
463
|
+
# The URI options spec requires that we raise an error if there are conflicting values of
|
464
|
+
# 'tls' and 'ssl'. In order to fulfill this, we parse the values of each instance into an
|
465
|
+
# array; assuming all values in the array are the same, we replace the array with that value.
|
466
|
+
unless uri_options[:ssl].nil? || uri_options[:ssl].empty?
|
467
|
+
unless uri_options[:ssl].uniq.length == 1
|
468
|
+
raise_invalid_error_no_fmt!("all instances of 'tls' and 'ssl' must have the same value")
|
574
469
|
end
|
575
|
-
else
|
576
|
-
value
|
577
|
-
end
|
578
|
-
end
|
579
470
|
|
580
|
-
|
581
|
-
#
|
582
|
-
# @param [Hash] uri_options The base target.
|
583
|
-
# @param [Symbol] group Group subtarget.
|
584
|
-
#
|
585
|
-
# @return [Hash] The target for the option.
|
586
|
-
def select_target(uri_options, group = nil)
|
587
|
-
if group
|
588
|
-
uri_options[group] ||= {}
|
589
|
-
else
|
590
|
-
uri_options
|
471
|
+
uri_options[:ssl] = uri_options[:ssl].first
|
591
472
|
end
|
592
|
-
end
|
593
473
|
|
594
|
-
|
595
|
-
|
596
|
-
|
597
|
-
|
598
|
-
#
|
599
|
-
# Specifically required to append an additional tag set
|
600
|
-
# to the array of tag sets without overwriting the original.
|
601
|
-
#
|
602
|
-
# @param target [Hash] The destination.
|
603
|
-
# @param value [Object] The value to be merged.
|
604
|
-
# @param name [Symbol] The name of the option.
|
605
|
-
def merge_uri_option(target, value, name)
|
606
|
-
if target.key?(name)
|
607
|
-
if REPEATABLE_OPTIONS.include?(name)
|
608
|
-
target[name] += value
|
609
|
-
else
|
610
|
-
log_warn("Repeated option key: #{name}.")
|
474
|
+
# Check for conflicting TLS insecure options.
|
475
|
+
unless uri_options[:ssl_verify].nil?
|
476
|
+
unless uri_options[:ssl_verify_certificate].nil?
|
477
|
+
raise_invalid_error_no_fmt!("'tlsInsecure' and 'tlsAllowInvalidCertificates' cannot both be specified")
|
611
478
|
end
|
612
|
-
else
|
613
|
-
target.merge!(name => value)
|
614
|
-
end
|
615
|
-
end
|
616
|
-
|
617
|
-
# Adds an option to the uri options hash via the supplied strategy.
|
618
|
-
#
|
619
|
-
# Acquires a target for the option based on group.
|
620
|
-
# Transforms the value.
|
621
|
-
# Merges the option into the target.
|
622
|
-
#
|
623
|
-
# @param key [String] URI option name.
|
624
|
-
# @param value [String] The value of the option.
|
625
|
-
# @param uri_options [Hash] The base option target.
|
626
|
-
def add_uri_option(key, value, uri_options)
|
627
|
-
strategy = URI_OPTION_MAP[key.downcase]
|
628
|
-
if strategy.nil?
|
629
|
-
log_warn("Unsupported URI option '#{key}' on URI '#{@string}'. It will be ignored.")
|
630
|
-
return
|
631
|
-
end
|
632
|
-
|
633
|
-
target = select_target(uri_options, strategy[:group])
|
634
|
-
value = apply_transform(key, value, strategy[:type])
|
635
|
-
merge_uri_option(target, value, strategy[:name])
|
636
|
-
end
|
637
|
-
|
638
|
-
# Authentication mechanism transformation.
|
639
|
-
#
|
640
|
-
# @param value [String] The authentication mechanism.
|
641
|
-
#
|
642
|
-
# @return [Symbol] The transformed authentication mechanism.
|
643
|
-
def auth_mech(value)
|
644
|
-
(AUTH_MECH_MAP[value.upcase] || value).tap do |mech|
|
645
|
-
log_warn("#{value} is not a valid auth mechanism") unless mech
|
646
|
-
end
|
647
|
-
end
|
648
|
-
|
649
|
-
# Read preference mode transformation.
|
650
|
-
#
|
651
|
-
# @param value [String] The read mode string value.
|
652
|
-
#
|
653
|
-
# @return [Symbol] The read mode symbol.
|
654
|
-
def read_mode(value)
|
655
|
-
READ_MODE_MAP[value.downcase] || value
|
656
|
-
end
|
657
|
-
|
658
|
-
# Read preference tags transformation.
|
659
|
-
#
|
660
|
-
# @param value [String] The string representing tag set.
|
661
|
-
#
|
662
|
-
# @return [Array<Hash>] Array with tag set.
|
663
|
-
def read_tags(value)
|
664
|
-
[read_set(value)]
|
665
|
-
end
|
666
|
-
|
667
|
-
# Read preference tag set extractor.
|
668
|
-
#
|
669
|
-
# @param value [String] The tag set string.
|
670
|
-
#
|
671
|
-
# @return [Hash] The tag set hash.
|
672
|
-
def read_set(value)
|
673
|
-
hash_extractor('readPreferenceTags', value)
|
674
|
-
end
|
675
479
|
|
676
|
-
|
677
|
-
|
678
|
-
# @param value [ String ] The auth mechanism properties string.
|
679
|
-
#
|
680
|
-
# @return [ Hash ] The auth mechanism properties hash.
|
681
|
-
def auth_mech_props(value)
|
682
|
-
properties = hash_extractor('authMechanismProperties', value)
|
683
|
-
if properties[:canonicalize_host_name]
|
684
|
-
properties.merge!(canonicalize_host_name:
|
685
|
-
properties[:canonicalize_host_name].downcase == 'true')
|
686
|
-
end
|
687
|
-
properties
|
688
|
-
end
|
689
|
-
|
690
|
-
# Parses the zlib compression level.
|
691
|
-
#
|
692
|
-
# @param value [ String ] The zlib compression level string.
|
693
|
-
#
|
694
|
-
# @return [ Integer | nil ] The compression level value if it is between -1 and 9 (inclusive),
|
695
|
-
# otherwise nil (and a warning will be logged).
|
696
|
-
def zlib_compression_level(value)
|
697
|
-
if /\A-?\d+\z/ =~ value
|
698
|
-
i = value.to_i
|
699
|
-
|
700
|
-
if i >= -1 && i <= 9
|
701
|
-
return i
|
480
|
+
unless uri_options[:ssl_verify_hostname].nil?
|
481
|
+
raise_invalid_error_no_fmt!("tlsInsecure' and 'tlsAllowInvalidHostnames' cannot both be specified")
|
702
482
|
end
|
703
|
-
end
|
704
|
-
|
705
|
-
log_warn("#{value} is not a valid zlibCompressionLevel")
|
706
|
-
nil
|
707
|
-
end
|
708
|
-
|
709
|
-
# Converts the value into a boolean and returns it wrapped in an array.
|
710
|
-
#
|
711
|
-
# @param name [ String ] Name of the URI option being processed.
|
712
|
-
# @param value [ String ] URI option value.
|
713
|
-
#
|
714
|
-
# @return [ Array<true | false> ] The boolean value parsed and wraped
|
715
|
-
# in an array.
|
716
|
-
def convert_repeated_bool(name, value)
|
717
|
-
[convert_bool(name, value)]
|
718
|
-
end
|
719
|
-
|
720
|
-
# Converts +value+ into an integer.
|
721
|
-
#
|
722
|
-
# If the value is not a valid integer, warns and returns nil.
|
723
|
-
#
|
724
|
-
# @param name [ String ] Name of the URI option being processed.
|
725
|
-
# @param value [ String ] URI option value.
|
726
|
-
#
|
727
|
-
# @return [ nil | Integer ] Converted value.
|
728
|
-
def convert_integer(name, value)
|
729
|
-
unless /\A\d+\z/ =~ value
|
730
|
-
log_warn("#{value} is not a valid integer for #{name}")
|
731
|
-
return nil
|
732
|
-
end
|
733
|
-
|
734
|
-
value.to_i
|
735
|
-
end
|
736
|
-
|
737
|
-
# Converts +value+ into a symbol.
|
738
|
-
#
|
739
|
-
# @param name [ String ] Name of the URI option being processed.
|
740
|
-
# @param value [ String ] URI option value.
|
741
|
-
#
|
742
|
-
# @return [ Symbol ] Converted value.
|
743
|
-
def convert_symbol(name, value)
|
744
|
-
value.to_sym
|
745
|
-
end
|
746
|
-
|
747
|
-
# Converts +value+ as a write concern.
|
748
|
-
#
|
749
|
-
# If +value+ is the word "majority", returns the symbol :majority.
|
750
|
-
# If +value+ is a number, returns the number as an integer.
|
751
|
-
# Otherwise returns the string +value+ unchanged.
|
752
|
-
#
|
753
|
-
# @param name [ String ] Name of the URI option being processed.
|
754
|
-
# @param value [ String ] URI option value.
|
755
|
-
#
|
756
|
-
# @return [ Integer | Symbol | String ] Converted value.
|
757
|
-
def convert_w(name, value)
|
758
|
-
case value
|
759
|
-
when 'majority'
|
760
|
-
:majority
|
761
|
-
when /\A[0-9]+\z/
|
762
|
-
value.to_i
|
763
|
-
else
|
764
|
-
value
|
765
|
-
end
|
766
|
-
end
|
767
|
-
|
768
|
-
# Converts +value+ to a boolean.
|
769
|
-
#
|
770
|
-
# Returns true for 'true', false for 'false', otherwise nil.
|
771
|
-
#
|
772
|
-
# @param name [ String ] Name of the URI option being processed.
|
773
|
-
# @param value [ String ] URI option value.
|
774
|
-
#
|
775
|
-
# @return [ true | false | nil ] Converted value.
|
776
|
-
def convert_bool(name, value)
|
777
|
-
case value
|
778
|
-
when "true", 'TRUE'
|
779
|
-
true
|
780
|
-
when "false", 'FALSE'
|
781
|
-
false
|
782
|
-
else
|
783
|
-
log_warn("invalid boolean option for #{name}: #{value}")
|
784
|
-
nil
|
785
|
-
end
|
786
|
-
end
|
787
|
-
|
788
|
-
# Parses a boolean value and returns its inverse.
|
789
|
-
#
|
790
|
-
# @param value [ String ] The URI option value.
|
791
|
-
#
|
792
|
-
# @return [ true | false | nil ] The inverse of the boolean value parsed out, otherwise nil
|
793
|
-
# (and a warning will be logged).
|
794
|
-
def convert_inverse_bool(name, value)
|
795
|
-
b = convert_bool(name, value)
|
796
483
|
|
797
|
-
|
798
|
-
|
799
|
-
else
|
800
|
-
!b
|
801
|
-
end
|
802
|
-
end
|
803
|
-
|
804
|
-
# Parses the max staleness value, which must be either "0" or an integer greater or equal to 90.
|
805
|
-
#
|
806
|
-
# @param value [ String ] The max staleness string.
|
807
|
-
#
|
808
|
-
# @return [ Integer | nil ] The max staleness integer parsed out if it is valid, otherwise nil
|
809
|
-
# (and a warning will be logged).
|
810
|
-
def max_staleness(value)
|
811
|
-
if /\A-?\d+\z/ =~ value
|
812
|
-
int = value.to_i
|
813
|
-
|
814
|
-
if int == -1
|
815
|
-
int = nil
|
484
|
+
unless uri_options[:ssl_verify_ocsp_endpoint].nil?
|
485
|
+
raise_invalid_error_no_fmt!("tlsInsecure' and 'tlsDisableOCSPEndpointCheck' cannot both be specified")
|
816
486
|
end
|
487
|
+
end
|
817
488
|
|
818
|
-
|
819
|
-
|
489
|
+
unless uri_options[:ssl_verify_certificate].nil?
|
490
|
+
unless uri_options[:ssl_verify_ocsp_endpoint].nil?
|
491
|
+
raise_invalid_error_no_fmt!("tlsAllowInvalidCertificates' and 'tlsDisableOCSPEndpointCheck' cannot both be specified")
|
820
492
|
end
|
821
|
-
|
822
|
-
return int
|
823
493
|
end
|
824
494
|
|
825
|
-
|
826
|
-
|
827
|
-
|
828
|
-
|
829
|
-
|
830
|
-
# to use fractions where more precision is necessary. The connection string
|
831
|
-
# options are always in MS so we provide an easy conversion type.
|
832
|
-
#
|
833
|
-
# @param [ Integer ] value The millisecond value.
|
834
|
-
#
|
835
|
-
# @return [ Float ] The seconds value.
|
836
|
-
#
|
837
|
-
# @since 2.0.0
|
838
|
-
def convert_ms(name, value)
|
839
|
-
unless /\A-?\d+(\.\d+)?\z/ =~ value
|
840
|
-
log_warn("Invalid ms value for #{name}: #{value}")
|
841
|
-
return nil
|
495
|
+
# Since we know that the only URI option that sets :ssl_cert is
|
496
|
+
# "tlsCertificateKeyFile", any value set for :ssl_cert must also be set
|
497
|
+
# for :ssl_key.
|
498
|
+
if uri_options[:ssl_cert]
|
499
|
+
uri_options[:ssl_key] = uri_options[:ssl_cert]
|
842
500
|
end
|
843
501
|
|
844
|
-
if
|
845
|
-
|
846
|
-
|
502
|
+
if uri_options[:write_concern] && !uri_options[:write_concern].empty?
|
503
|
+
begin
|
504
|
+
WriteConcern.get(uri_options[:write_concern])
|
505
|
+
rescue Error::InvalidWriteConcern => e
|
506
|
+
raise_invalid_error_no_fmt!("#{e.class}: #{e}")
|
507
|
+
end
|
847
508
|
end
|
848
509
|
|
849
|
-
|
850
|
-
|
851
|
-
|
852
|
-
# Extract values from the string and put them into a nested hash.
|
853
|
-
#
|
854
|
-
# @param value [ String ] The string to build a hash from.
|
855
|
-
#
|
856
|
-
# @return [ Hash ] The hash built from the string.
|
857
|
-
def hash_extractor(name, value)
|
858
|
-
value.split(',').reduce({}) do |set, tag|
|
859
|
-
k, v = tag.split(':')
|
860
|
-
if v.nil?
|
861
|
-
log_warn("Invalid hash value for #{name}: #{value}")
|
862
|
-
return nil
|
510
|
+
if uri_options[:direct_connection]
|
511
|
+
if uri_options[:connect] && uri_options[:connect].to_s != 'direct'
|
512
|
+
raise_invalid_error_no_fmt!("directConnection=true cannot be used with connect=#{uri_options[:connect]}")
|
863
513
|
end
|
864
|
-
|
865
|
-
|
514
|
+
if servers.length > 1
|
515
|
+
raise_invalid_error_no_fmt!("directConnection=true cannot be used with multiple seeds")
|
516
|
+
end
|
517
|
+
elsif uri_options[:direct_connection] == false && uri_options[:connect].to_s == 'direct'
|
518
|
+
raise_invalid_error_no_fmt!("directConnection=false cannot be used with connect=direct")
|
866
519
|
end
|
867
520
|
end
|
868
|
-
|
869
|
-
# Extract values from the string and put them into an array.
|
870
|
-
#
|
871
|
-
# @param [ String ] value The string to build an array from.
|
872
|
-
#
|
873
|
-
# @return [ Array ] The array built from the string.
|
874
|
-
def array(value)
|
875
|
-
value.split(',')
|
876
|
-
end
|
877
521
|
end
|
878
522
|
end
|
879
523
|
|
524
|
+
require 'mongo/uri/options_mapper'
|
880
525
|
require 'mongo/uri/srv_protocol'
|