mongo 2.17.4 → 2.18.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53f70e2267f5b60649d991f75a7d88ecd379b5d34ea72265e30b4fa4c19d9429
-  data.tar.gz: 23848a99f81e22fcfda546fa5d1aa465a9daae9dc6e60b284744344de0808f03
+  metadata.gz: 27dd7818b5dc4a0b930ad91ec1607720ad7a02b1b6ea801499e7102ad758db17
+  data.tar.gz: 7c06c0a8e70f17a81529b727fcecb10c6a39c04fd36111cac51d3802b1494bf0
 SHA512:
-  metadata.gz: 37d4d4d674b6f1b78d18254c3b8ec0066d4772969eafbe2c03626a21fb546a5884bb541a547412c4ba4ce19c9d197166db08b0bb1a2178716c82e5a84ea41c50
-  data.tar.gz: 171122ee2308f67158f629e572a446665627ac2ed7d98741d747534fb8133c75ebd912cd661356c27a9d49bc534ff352a597498df6e724f3ec261f1fe16681e1
+  metadata.gz: 6551874d18d17670e04c13a05ec7e1ee793dfe5984933dbd476adf12603d65ff36c377681d5eb49b94b8da9523d8e196a306da8f3496b0400f6c82302db9b4ea
+  data.tar.gz: f337ac92bc26479b70ce26a6c88056a57ee2201c586fa134ead68ad00041368fd77edb4c07d7db7e042d1525aeca75998c51e6209b77069b752739cc68d96aae

data/README.md

@@ -7,21 +7,17 @@ The officially supported Ruby driver for [MongoDB](https://www.mongodb.org/).
 
 The Ruby driver supports Ruby 2.5-3.0 and JRuby 9.2.
 
-
-Documentation
--------------
+## Documentation
 
 High level documentation and usage examples are located
 [here](http://docs.mongodb.org/ecosystem/drivers/ruby/).
 
 API documentation for the most recent release can be found
-[here](https://docs.mongodb.com/ruby-driver/current/api/).
+[here](https://mongodb.com/docs/ruby-driver/current/api/).
 To build API documentation for the master branch, check out the
 repository locally and run `rake docs`.
 
-
-Support
--------
+## Support
 
 Commercial support for the driver is available through the
 [MongoDB Support Portal](https://support.mongodb.com/).
@@ -29,17 +25,15 @@ Commercial support for the driver is available through the
 For questions, discussions or general technical support, please visit the
 [MongoDB Community Forum](https://developer.mongodb.com/community/forums/tags/c/drivers-odms-connectors/7/ruby-driver).
 
-Please see [Technical Support](https://docs.mongodb.com/manual/support/) page
+Please see [Technical Support](https://mongodb.com/docs/manual/support/) page
 in the documentation for other support resources.
 
-
-Bugs & Feature Requests
------------------------
+## Bugs & Feature Requests
 
 To report a bug in the driver or request a feature specific to the Ruby driver:
 
 1. Visit [our issue tracker](https://jira.mongodb.org/) and login
-(or create an account if you do not have one already).
+   (or create an account if you do not have one already).
 2. Navigate to the [RUBY project](https://jira.mongodb.org/browse/RUBY).
 3. Click 'Create Issue' and fill out all of the applicable form fields.
 
@@ -60,54 +54,44 @@ is publicly visible.
 - Provide any sensitive data or server logs.
 - Report potential security issues publicly (see 'Security Issues' below).
 
-
-Security Issues
----------------
+## Security Issues
 
 If you have identified a potential security-related issue in the Ruby driver
 (or any other MongoDB product), please report it by following the
 [instructions here](http://docs.mongodb.org/manual/tutorial/create-a-vulnerability-report).
 
-
-Product Feature Requests
-------------------------
+## Product Feature Requests
 
 To request a feature which is not specific to the Ruby driver, or which
 affects more than the driver alone (for example, a feature which requires
 MongoDB server support), please submit your idea through the
 [MongoDB Feedback Forum](https://feedback.mongodb.com/forums/924286-drivers).
 
-
-Running Tests
--------------
+## Running Tests
 
 Please refer to [spec/README.md](spec/README.md) for instructions on how
 to run the driver's test suite.
 
-
-Release History
----------------
+## Release History
 
 Full release notes and release history are available [on the GitHub releases
 page](https://github.com/mongodb/mongo-ruby-driver/releases).
 
+## License
 
-License
--------
-
- Copyright (C) 2009-2020 MongoDB, Inc.
+Copyright (C) 2009-2020 MongoDB, Inc.
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 [rubygems-img]: https://badge.fury.io/rb/mongo.svg
 [rubygems-url]: http://badge.fury.io/rb/mongo

data/lib/mongo/auth/base.rb

@@ -112,7 +112,12 @@ module Mongo
         reply = connection.dispatch([msg], context)
         reply_document = reply.documents.first
         validate_reply!(connection, conversation, reply_document)
-        result = Operation::Result.new(reply, connection.description)
+        connection_global_id = if connection.respond_to?(:global_id)
+          connection.global_id
+        else
+          nil
+        end
+        result = Operation::Result.new(reply, connection.description, connection_global_id)
         connection.update_cluster_time(result)
         reply_document
       end
@@ -126,10 +131,12 @@ module Mongo
             code_name: doc[:codeName],
             message: doc[:errmsg],
           )
+
           raise Unauthorized.new(user,
             used_mechanism: self.class.const_get(:MECHANISM),
             message: message,
             server: connection.server,
+            code: doc[:code]
           )
         end
       end

data/lib/mongo/auth.rb

@@ -30,6 +30,9 @@ require 'mongo/auth/ldap'
 require 'mongo/auth/scram'
 require 'mongo/auth/scram256'
 require 'mongo/auth/x509'
+require 'mongo/error/read_write_retryable'
+require 'mongo/error/labelable'
+
 
 module Mongo
 
@@ -127,6 +130,11 @@ module Mongo
     #
     # @since 2.0.0
     class Unauthorized < Mongo::Error::AuthError
+      include Error::ReadWriteRetryable
+      include Error::Labelable
+
+      # @return [ Integer ] The error code.
+      attr_reader :code
 
       # Instantiate the new error.
       #
@@ -139,11 +147,14 @@ module Mongo
       # @param [ String ] message The error message returned by the server.
       # @param [ Server ] server The server instance that authentication
       #   was attempted against.
+      # @param [ Integer ] The error code.
       #
       # @since 2.0.0
       def initialize(user, used_mechanism: nil, message: nil,
-        server: nil
+        server: nil, code: nil
       )
+        @code = code
+
         configured_bits = []
         used_bits = [
           "auth source: #{user.auth_source}",

data/lib/mongo/bulk_write/result.rb

@@ -23,6 +23,11 @@ module Mongo
     # @since 2.0.6
     class Result
 
+      # @return [ Boolean ] Is the result acknowledged?
+      def acknowledged?
+        @acknowledged
+      end
+
       # Constant for number removed.
       #
       # @since 2.1.0
@@ -94,10 +99,14 @@ module Mongo
       #   Result.new({ 'n_inserted' => 10 })
       #
       # @param [ BSON::Document, Hash ] results The results document.
+      # @param [ Boolean ] acknowledged Is the result acknowledged?
       #
       # @since 2.1.0
-      def initialize(results)
+      #
+      # @api private
+      def initialize(results, acknowledged)
         @results = results
+        @acknowledged = acknowledged
       end
 
       # Returns the number of documents inserted.

data/lib/mongo/bulk_write/result_combiner.rb

@@ -70,20 +70,18 @@ module Mongo
         end
         combine_errors!(result)
         @count += count
+        @acknowledged = result.acknowledged?
       end
 
       # Get the final result.
       #
       # @api private
       #
-      # @example Get the final result.
-      #   combinator.result
-      #
       # @return [ BulkWrite::Result ] The final result.
       #
       # @since 2.1.0
       def result
-        BulkWrite::Result.new(results).validate!
+        BulkWrite::Result.new(results, @acknowledged).validate!
       end
 
       private

data/lib/mongo/bulk_write.rb

@@ -59,37 +59,34 @@ module Mongo
       operation_id = Monitoring.next_operation_id
       result_combiner = ResultCombiner.new
       operations = op_combiner.combine
+      validate_requests!
 
       client.send(:with_session, @options) do |session|
         context = Operation::Context.new(client: client, session: session)
         operations.each do |operation|
           if single_statement?(operation)
             write_concern = write_concern(session)
-            write_with_retry(session, write_concern) do |server, txn_num|
-              server.with_connection(service_id: context.service_id) do |connection|
-                execute_operation(
-                  operation.keys.first,
-                  operation.values.flatten,
-                  connection,
-                  context,
-                  operation_id,
-                  result_combiner,
-                  session,
-                  txn_num)
-              end
+            write_with_retry(write_concern, context: context) do |connection, txn_num, context|
+              execute_operation(
+                operation.keys.first,
+                operation.values.flatten,
+                connection,
+                context,
+                operation_id,
+                result_combiner,
+                session,
+                txn_num)
             end
           else
-            nro_write_with_retry(session, write_concern) do |server|
-              server.with_connection(service_id: context.service_id) do |connection|
-                execute_operation(
-                  operation.keys.first,
-                  operation.values.flatten,
-                  connection,
-                  context,
-                  operation_id,
-                  result_combiner,
-                  session)
-              end
+            nro_write_with_retry(write_concern, context: context) do |connection, txn_num, context|
+              execute_operation(
+                operation.keys.first,
+                operation.values.flatten,
+                connection,
+                context,
+                operation_id,
+                result_combiner,
+                session)
             end
           end
         end
@@ -179,7 +176,9 @@ module Mongo
         :max_time_ms => options[:max_time_ms],
         :options => options,
         :id_generator => client.options[:id_generator],
-        :session => session
+        :session => session,
+        :comment => options[:comment],
+        :let => options[:let],
       }
     end
 
@@ -188,7 +187,7 @@ module Mongo
       validate_array_filters!(connection)
       validate_hint!(connection)
 
-      unpin_maybe(session) do
+      unpin_maybe(session, connection) do
         if values.size > connection.description.max_write_batch_size
           split_execute(name, values, connection, context, operation_id, result_combiner, session, txn_num)
         else
@@ -210,7 +209,7 @@ module Mongo
     # 3.6+ servers being able to split less.
     rescue Error::MaxBSONSize, Error::MaxMessageSize => e
       raise e if values.size <= 1
-      unpin_maybe(session) do
+      unpin_maybe(session, connection) do
         split_execute(name, values, connection, context, operation_id, result_combiner, session, txn_num)
       end
     end
@@ -222,7 +221,7 @@ module Mongo
     def split_execute(name, values, connection, context, operation_id, result_combiner, session, txn_num)
       execute_operation(name, values.shift(values.size / 2), connection, context, operation_id, result_combiner, session, txn_num)
 
-      txn_num = session.next_txn_num if txn_num && !session.in_transaction?
+      txn_num = session.next_txn_num if txn_num
       execute_operation(name, values, connection, context, operation_id, result_combiner, session, txn_num)
     end
 
@@ -278,12 +277,93 @@ module Mongo
 
     def validate_hint!(connection)
       if op_combiner.has_hint?
-        if write_concern && !write_concern.acknowledged?
+        if !can_hint?(connection) && write_concern && !write_concern.acknowledged?
           raise Error::UnsupportedOption.hint_error(unacknowledged_write: true)
         elsif !connection.features.update_delete_option_validation_enabled?
           raise Error::UnsupportedOption.hint_error
         end
       end
     end
+
+    # Loop through the requests and check if each operation is allowed to send
+    # a hint for each operation on the given server version.
+    #
+    # For the following operations, the client can send a hint for servers >= 4.2
+    # and for the rest, the client can only send it for 4.4+:
+    #   - updateOne
+    #   - updateMany
+    #   - replaceOne
+    #
+    # @param [ Connection ] connection The connection object.
+    #
+    # @return [ true | false ] Whether the request is able to send hints for
+    #   the current server version.
+    def can_hint?(connection)
+      gte_4_2 = connection.server.description.server_version_gte?('4.2')
+      gte_4_4 = connection.server.description.server_version_gte?('4.4')
+      op_combiner.requests.all? do |req|
+        op = req.keys.first
+        if req[op].keys.include?(:hint)
+          if [:update_one, :update_many, :replace_one].include?(op)
+            gte_4_2
+          else
+            gte_4_4
+          end
+        else
+          true
+        end
+      end
+    end
+
+    # Perform the request document validation required by driver specifications.
+    # This method validates the first key of each update request document to be
+    # an operator (i.e. start with $) and the first key of each replacement
+    # document to not be an operator (i.e. not start with $). The request document
+    # may be invalid without this method flagging it as such (for example an
+    # update or replacement document containing some keys which are operators
+    # and some which are not), in which case the driver expects the server to
+    # fail the operation with an error.
+    #
+    # @raise [ Error::InvalidUpdateDocument, Error::InvalidReplacementDocument ]
+    #   if the document is invalid.
+    def validate_requests!
+      @requests.each do |req|
+        if op = req.keys.first
+          if [:update_one, :update_many].include?(op)
+            if doc = maybe_first(req.dig(op, :update))
+              if key = doc.keys&.first
+                unless key.to_s.start_with?("$")
+                  if Mongo.validate_update_replace
+                    raise Error::InvalidUpdateDocument.new(key: key)
+                  else
+                    Error::InvalidUpdateDocument.warn(Logger.logger, key)
+                  end
+                end
+              end
+            end
+          elsif op == :replace_one
+            if key = req.dig(op, :replacement)&.keys&.first
+              if key.to_s.start_with?("$")
+                if Mongo.validate_update_replace
+                  raise Error::InvalidReplacementDocument.new(key: key)
+                else
+                  Error::InvalidReplacementDocument.warn(Logger.logger, key)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    # If the given object is an array return the first element, otherwise
+    # return the given object.
+    #
+    # @param [ Object ] obj The given object.
+    #
+    # @return [ Object ] The first element of the array or the given object.
+    def maybe_first(obj)
+      obj.is_a?(Array) ? obj.first : obj
+    end
   end
 end

data/lib/mongo/client.rb

@@ -92,6 +92,8 @@ module Mongo
       :server_api,
       :server_selection_timeout,
       :socket_timeout,
+      :srv_max_hosts,
+      :srv_service_name,
       :ssl,
       :ssl_ca_cert,
       :ssl_ca_cert_object,
@@ -340,6 +342,13 @@ module Mongo
     #   for selecting a server for an operation.
     # @option options [ Float ] :socket_timeout The timeout, in seconds, to
     #   execute operations on a socket.
+    # @option options [ Integer ] :srv_max_hosts The maximum number of mongoses
+    #   that the driver will communicate with for sharded topologies. If this
+    #   option is 0, then there will be no maximum number of mongoses. If the
+    #   given URI resolves to more hosts than ``:srv_max_hosts``, the client
+    #   will ramdomly choose an ``:srv_max_hosts`` sized subset of hosts.
+    # @option options [ String ] :srv_service_name The service name to use in
+    #   the SRV DNS query.
     # @option options [ true, false ] :ssl Whether to use TLS.
     # @option options [ String ] :ssl_ca_cert The file containing concatenated
     #   certificate authority certificates used to validate certs passed from the
@@ -420,9 +429,13 @@ module Mongo
     #     instance containing the encryption key vault
     #   - :key_vault_namespace => String, the namespace of the key vault in the
     #     format database.collection
-    #   - :kms_providers => Hash, A hash of key management service configuration
-    #     information. Valid hash keys are :local or :aws. There may be more
-    #     than one kms provider specified.
+    #   - :kms_providers => Hash, A hash of key management service (KMS) configuration
+    #     information. Valid hash keys are :aws, :azure, :gcp, :kmip, :local.
+    #     There may be more than one kms provider specified.
+    #   - :kms_tls_options => Hash, A hash of TLS options to authenticate to
+    #     KMS providers, usually used for KMIP servers. Valid hash keys
+    #     are :aws, :azure, :gcp, :kmip, :local. There may be more than one
+    #     kms provider specified.
     #   - :schema_map => Hash | nil, JSONSchema for one or more collections
     #     specifying which fields should be encrypted.
     #     - Note: Schemas supplied in the schema_map only apply to configuring
@@ -433,10 +446,18 @@ module Mongo
     #       JSON Schemas obtained from the server. It protects against a
     #       malicious server advertising a false JSON Schema, which could trick
     #       the client into sending unencrypted data that should be encrypted.
+    #     - Note: If a collection is present on both the :encrypted_fields_map
+    #       and :schema_map, an error will be raised.
     #   - :bypass_auto_encryption => Boolean, when true, disables auto encryption;
     #     defaults to false.
     #   - :extra_options => Hash | nil, options related to spawning mongocryptd
     #     (this part of the API is subject to change).
+    #   - :encrypted_fields_map => Hash | nil, maps a collection namespace to
+    #     a hash describing encrypted fields for queryable encryption.
+    #     - Note: If a collection is present on both the encryptedFieldsMap
+    #       and schemaMap, an error will be raised.
+    #   - :bypass_query_analysis => Boolean | nil, when true disables automatic
+    #     analysis of outgoing commands.
     #
     #   Notes on automatic encryption:
     #   - Automatic encryption is an enterprise only feature that only applies
@@ -532,7 +553,7 @@ module Mongo
       end
 =end
       @options.freeze
-      validate_options!(addresses)
+      validate_options!(addresses, is_srv: uri.is_a?(URI::SRVProtocol))
       validate_authentication_options!
 
       database_options = @options.dup
@@ -885,9 +906,11 @@ module Mongo
     #   which databases are returned based on user privileges when access control
     #   is enabled
     #
-    #   See https://docs.mongodb.com/manual/reference/command/listDatabases/
+    #   See https://mongodb.com/docs/manual/reference/command/listDatabases/
     #   for more information and usage.
     # @option opts [ Session ] :session The session to use.
+    # @option options [ Object ] :comment A user-provided
+    #   comment to attach to this command.
     #
     # @return [ Array<String> ] The names of the databases.
     #
@@ -909,9 +932,11 @@ module Mongo
     #   which databases are returned based on user privileges when access control
     #   is enabled
     #
-    #   See https://docs.mongodb.com/manual/reference/command/listDatabases/
+    #   See https://mongodb.com/docs/manual/reference/command/listDatabases/
     #   for more information and usage.
     # @option opts [ Session ] :session The session to use.
+    # @option options [ Object ] :comment A user-provided
+    #   comment to attach to this command.
     #
     # @return [ Array<Hash> ] The info for each database.
     #
@@ -933,6 +958,8 @@ module Mongo
     # @param [ Hash ] opts The command options.
     #
     # @option opts [ Session ] :session The session to use.
+    # @option options [ Object ] :comment A user-provided
+    #   comment to attach to this command.
     #
     # @return [ Array<Mongo::Database> ] The list of database objects.
     #
@@ -984,11 +1011,35 @@ module Mongo
     #
     # @param [ Array<Hash> ] pipeline Optional additional filter operators.
     # @param [ Hash ] options The change stream options.
+    # @option options [ String ] :full_document Allowed values: nil, 'default',
+    #   'updateLookup', 'whenAvailable', 'required'.
     #
-    # @option options [ String ] :full_document Allowed values: 'default', 'updateLookup'.
-    #   Defaults to 'default'. When set to 'updateLookup', the change notification for partial
-    #   updates will include both a delta describing the changes to the document, as well as a copy
-    #   of the entire document that was changed from some time after the change occurred.
+    #   The default is to not send a value (i.e. nil), which is equivalent to
+    #   'default'. By default, the change notification for partial updates will
+    #   include a delta describing the changes to the document.
+    #
+    #   When set to 'updateLookup', the change notification for partial updates
+    #   will include both a delta describing the changes to the document as well
+    #   as a copy of the entire document that was changed from some time after
+    #   the change occurred.
+    #
+    #   When set to 'whenAvailable', configures the change stream to return the
+    #   post-image of the modified document for replace and update change events
+    #   if the post-image for this event is available.
+    #
+    #   When set to 'required', the same behavior as 'whenAvailable' except that
+    #   an error is raised if the post-image is not available.
+    # @option options [ String ] :full_document_before_change Allowed values: nil,
+    #   'whenAvailable', 'required', 'off'.
+    #
+    #   The default is to not send a value (i.e. nil), which is equivalent to 'off'.
+    #
+    #   When set to 'whenAvailable', configures the change stream to return the
+    #   pre-image of the modified document for replace, update, and delete change
+    #   events if it is available.
+    #
+    #   When set to 'required', the same behavior as 'whenAvailable' except that
+    #   an error is raised if the pre-image is not available.
     # @option options [ BSON::Document, Hash ] :resume_after Specifies the logical starting point
     #   for the new change stream.
     # @option options [ Integer ] :max_await_time_ms The maximum amount of time for the server to
@@ -1000,6 +1051,8 @@ module Mongo
     #   changes that occurred at or after the specified timestamp. Any command run
     #   against the server will return a cluster time that can be used here.
     #   Only recognized by server versions 4.0+.
+    # @option options [ Object ] :comment A user-provided
+    #   comment to attach to this command.
     #
     # @note A change stream only allows 'majority' read concern.
     # @note This helper method is preferable to running a raw aggregation with a $changeStream
@@ -1088,6 +1141,14 @@ module Mongo
       end
     end
 
+    # Returns encrypted field map hash if provided when creating the client.
+    #
+    # @return [ Hash | nil ] Encrypted field map hash, or nil if not set.
+    # @api private
+    def encrypted_fields_map
+      @encrypted_fields_map ||= @options.fetch(:auto_encryption_options, {})[:encrypted_fields_map]
+    end
+
     private
 
     # Create a new encrypter object using the client's auto encryption options
@@ -1147,11 +1208,26 @@ module Mongo
 
       cluster.validate_session_support!
 
-      Session.new(cluster.session_pool.checkout, self, { implicit: true }.merge(options))
+      options = {implicit: true}.update(options)
+
+      server_session = if options[:implicit]
+        nil
+      else
+        cluster.session_pool.checkout
+      end
+
+      Session.new(server_session, self, options)
     end
 
+    # Auxiliary method that is called by interpreter when copying the client
+    # via dup or clone.
+    #
+    # @param [ Mongo::Client ] original Client that is being cloned.
+    #
+    # @api private
     def initialize_copy(original)
       @options = original.options.dup
+      @connect_lock = Mutex.new
       @monitoring = @cluster ? monitoring : Monitoring.new(options)
       @database = nil
       @read_preference = nil
@@ -1226,6 +1302,12 @@ module Mongo
             end
 
             _options[key] = compressors unless compressors.empty?
+          elsif key == :srv_max_hosts
+            if v && (!v.is_a?(Integer) || v < 0)
+              log_warn("#{v} is not a valid integer for srv_max_hosts")
+            else
+              _options[key] = v
+            end
           else
             _options[key] = v
           end
@@ -1239,7 +1321,7 @@ module Mongo
     # Validates all options after they are set on the client.
     # This method is intended to catch combinations of options which are
     # not allowed.
-    def validate_options!(addresses = nil)
+    def validate_options!(addresses = nil, is_srv: nil)
       if options[:write] && options[:write_concern] && options[:write] != options[:write_concern]
         raise ArgumentError, "If :write and :write_concern are both given, they must be identical: #{options.inspect}"
       end
@@ -1349,6 +1431,26 @@ module Mongo
           end
         end
       end
+
+      if options[:srv_max_hosts] && options[:srv_max_hosts] > 0
+        if options[:replica_set]
+          raise ArgumentError, ":srv_max_hosts > 0 cannot be used with :replica_set option"
+        end
+
+        if options[:load_balanced]
+          raise ArgumentError, ":srv_max_hosts > 0 cannot be used with :load_balanced=true"
+        end
+      end
+
+      unless is_srv.nil? || is_srv
+        if options[:srv_max_hosts]
+          raise ArgumentError, ":srv_max_hosts cannot be used on non-SRV URI"
+        end
+
+        if options[:srv_service_name]
+          raise ArgumentError, ":srv_service_name cannot be used on non-SRV URI"
+        end
+      end
     end
 
     # Validates all authentication-related options after they are set on the client