mongo 2.18.2 → 2.19.1

data/lib/mongo/uri.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -20,7 +20,7 @@ module Mongo
   # The URI class provides a way for users to parse the MongoDB uri as
   # defined in the connection string format spec.
   #
-  # http://docs.mongodb.org/manual/reference/connection-string/
+  # https://www.mongodb.com/docs/manual/reference/connection-string/
   #
   # @example Use the uri string to make a client connection.
   #   uri = Mongo::URI.new('mongodb://localhost:27017')
@@ -80,7 +80,7 @@ module Mongo
     # MongoDB URI (connection string) documentation url
     #
     # @since 2.0.0
-    HELP = 'http://docs.mongodb.org/manual/reference/connection-string/'.freeze
+    HELP = 'https://www.mongodb.com/docs/manual/reference/connection-string/'.freeze
 
     # Unsafe characters that must be urlencoded.
     #
@@ -235,7 +235,7 @@ module Mongo
         raise Error::InvalidURI.new(string, 'Cannot parse an empty URI.')
       end
 
-      scheme, _, remaining = string.partition(SCHEME_DELIM)
+      scheme, _, _ = string.partition(SCHEME_DELIM)
       case scheme
         when MONGODB_SCHEME
           URI.new(string, opts)
@@ -328,8 +328,45 @@ module Mongo
       @database ? @database : Database::ADMIN
     end
 
+    # Get the uri as a string.
+    #
+    # @example Get the uri as a string.
+    #   uri.to_s
+    #
+    # @return [ String ] The uri string.
+    def to_s
+      reconstruct_uri
+    end
+
     private
 
+    # Reconstruct the URI from its parts. Invalid options are dropped and options
+    # are converted to camelCase.
+    #
+    # @return [ String ] the uri.
+    def reconstruct_uri
+      servers = @servers.join(',')
+      options = options_mapper.ruby_to_string(@uri_options).map do |k, vs|
+        unless vs.nil?
+          if vs.is_a?(Array)
+            vs.map { |v| "#{k}=#{v}" }.join('&')
+          else
+            "#{k}=#{vs}"
+          end
+        end
+      end.compact.join('&')
+
+      uri = "#{scheme}#{SCHEME_DELIM}"
+      uri += @user.to_s if @user
+      uri += "#{AUTH_USER_PWD_DELIM}#{@password}" if @password
+      uri += "@" if @user || @password
+      uri += @query_hostname || servers
+      uri += "/" if @database || !options.empty?
+      uri += @database.to_s if @database
+      uri += "?#{options}" unless options.empty?
+      uri
+    end
+
     def scheme
       MONGODB_SCHEME
     end
@@ -382,15 +419,6 @@ module Mongo
       raise_invalid_error!(e.message)
     end
 
-    def extract_db_opts!(string)
-      db_opts, _, creds_hosts = string.reverse.partition(DATABASE_DELIM)
-      db_opts, creds_hosts = creds_hosts, db_opts if creds_hosts.empty?
-      if db_opts.empty? && creds_hosts.include?(URI_OPTS_DELIM)
-        raise_invalid_error!(INVALID_OPTS_DELIM)
-      end
-      [ creds_hosts, db_opts ].map { |s| s.reverse }
-    end
-
     def options_mapper
       @options_mapper ||= OptionsMapper.new(
         logger: @options[:logger],

data/lib/mongo/utils.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2020 MongoDB Inc.
 #

data/lib/mongo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -20,5 +20,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.18.2'.freeze
+  VERSION = '2.19.1'.freeze
 end

data/lib/mongo/write_concern/acknowledged.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #

data/lib/mongo/write_concern/base.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #

data/lib/mongo/write_concern/unacknowledged.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #

data/lib/mongo/write_concern.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #

data/lib/mongo.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -38,6 +38,7 @@ require 'mongo/id'
 require 'mongo/bson'
 require 'mongo/semaphore'
 require 'mongo/distinguishing_semaphore'
+require 'mongo/condition_variable'
 require 'mongo/options'
 require 'mongo/loggable'
 require 'mongo/cluster_time'

data/mongo.gemspec

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# rubocop:todo all
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mongo/version'
@@ -6,8 +9,8 @@ Gem::Specification.new do |s|
   s.name              = 'mongo'
   s.version           = Mongo::VERSION
   s.platform          = Gem::Platform::RUBY
-
-  s.authors           = ['Tyler Brock', 'Emily Stolfo', 'Durran Jordan']
+  s.authors           = ["The MongoDB Ruby Team"]
+  s.email             = "dbx-ruby@mongodb.com"
   s.homepage          = 'https://mongodb.com/docs/ruby-driver/'
   s.summary           = 'Ruby driver for MongoDB'
   s.description       = 'A Ruby driver for MongoDB'

data/spec/atlas/atlas_connectivity_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/atlas/operations_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 
@@ -13,15 +13,10 @@ describe 'Operations' do
     end
   end
 
-  describe 'list_collections' do
-    # Atlas free tier proxy enforces restrictions on list_collections
-    # arguments. This tests verifies that list_collections works on Atlas
-
+  describe 'ping' do
     it 'works' do
-      # We are not allowed to mutate the database, therefore the list of
-      # collections would generally be empty.
       expect do
-        client.database.list_collections
+        client.database.command(ping: 1)
       end.not_to raise_error
     end
   end

data/spec/integration/auth_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/awaited_ismaster_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/aws_auth_credentials_cache_spec.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+# rubocop:todo all
+
+require 'spec_helper'
+
+describe Mongo::Auth::Aws::CredentialsCache do
+  require_auth 'aws-ec2', 'aws-ecs', 'aws-web-identity'
+
+  def new_client
+    ClientRegistry.instance.new_authorized_client.tap do |client|
+      @clients << client
+    end
+  end
+
+  before do
+    @clients = []
+    described_class.instance.clear
+  end
+
+  after do
+    @clients.each(&:close)
+  end
+
+  it 'caches the credentials' do
+    client1 = new_client
+    client1['test-collection'].find.to_a
+    expect(described_class.instance.credentials).not_to be_nil
+
+    described_class.instance.credentials = Mongo::Auth::Aws::Credentials.new(
+      described_class.instance.credentials.access_key_id,
+      described_class.instance.credentials.secret_access_key,
+      described_class.instance.credentials.session_token,
+      Time.now + 60
+    )
+    client2 = new_client
+    client2['test-collection'].find.to_a
+    expect(described_class.instance.credentials).not_to be_expired
+
+    described_class.instance.credentials = Mongo::Auth::Aws::Credentials.new(
+      'bad_access_key_id',
+      described_class.instance.credentials.secret_access_key,
+      described_class.instance.credentials.session_token,
+      described_class.instance.credentials.expiration
+    )
+    client3 = new_client
+    expect { client3['test-collection'].find.to_a }.to raise_error(Mongo::Auth::Unauthorized)
+    expect(described_class.instance.credentials).to be_nil
+    expect { client3['test-collection'].find.to_a }.not_to raise_error
+    expect(described_class.instance.credentials).not_to be_nil
+  end
+end

data/spec/integration/aws_auth_request_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 require 'net/http'
@@ -8,7 +8,7 @@ describe Mongo::Auth::Aws::Request do
   require_aws_auth
 
   before(:all) do
-    if ENV['AUTH'] =~ /aws-(ec2|ecs)/
+    if ENV['AUTH'] =~ /aws-(ec2|ecs|web)/
       skip "This test requires explicit credentials to be provided"
     end
   end

data/spec/integration/aws_credentials_retriever_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 require 'support/aws_utils'
@@ -20,6 +20,10 @@ describe Mongo::Auth::Aws::CredentialsRetriever do
       Mongo::Auth::User.new(auth_mech: :aws)
     end
 
+    before do
+      Mongo::Auth::Aws::CredentialsCache.instance.clear
+    end
+
     shared_examples_for 'retrieves the credentials' do
       it 'retrieves' do
         credentials.should be_a(Mongo::Auth::Aws::Credentials)
@@ -70,7 +74,7 @@ describe Mongo::Auth::Aws::CredentialsRetriever do
         it 'raises an error' do
           lambda do
             credentials
-          end.should raise_error(Mongo::Auth::InvalidConfiguration, /Could not locate AWS credentials/)
+          end.should raise_error(Mongo::Auth::Aws::CredentialsNotFound, /Could not locate AWS credentials/)
         end
       end
 
@@ -102,5 +106,31 @@ describe Mongo::Auth::Aws::CredentialsRetriever do
 
       it_behaves_like 'retrieves the credentials'
     end
+
+    context 'web identity' do
+      before(:all) do
+        unless ENV['AUTH'] == 'aws-web-identity'
+          skip "Set AUTH=aws-web-identity in environment to run Wed identity tests"
+        end
+      end
+
+      context 'with AWS_ROLE_SESSION_NAME' do
+        before do
+          stub_const('ENV', ENV.to_hash.merge('AWS_ROLE_SESSION_NAME' => 'mongo-ruby-driver-test-app'))
+        end
+
+        it_behaves_like 'retrieves the credentials'
+      end
+
+      context 'without AWS_ROLE_SESSION_NAME' do
+        before do
+          env = ENV.to_hash.dup
+          env.delete('AWS_ROLE_SESSION_NAME')
+          stub_const('ENV', env)
+        end
+
+        it_behaves_like 'retrieves the credentials'
+      end
+    end
   end
 end

data/spec/integration/aws_lambda_examples_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/integration/bson_symbol_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/bulk_insert_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/bulk_write_error_message_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 require 'spec_helper'
 
 describe 'BulkWriteError message' do

data/spec/integration/bulk_write_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/change_stream_examples_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/change_stream_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -289,6 +289,11 @@ describe 'Change stream integration' do
           enum.next
         end.to raise_error(Mongo::Error::OperationFailure, /101\b.*Failing command (due to|via) 'failCommand' failpoint/)
       end
+
+      after do
+        # TODO see RUBY-3135.
+        clear_fail_point(authorized_collection)
+      end
     end
   end
 

data/spec/integration/check_clean_slate_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/integration/client_authentication_options_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/integration/client_connectivity_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/client_construction_aws_auth_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -125,7 +125,7 @@ describe 'Client construction with AWS auth' do
         it 'does not connect' do
           lambda do
             client['foo'].insert_one(test: true)
-          end.should raise_error(Mongo::Auth::InvalidConfiguration, /Could not locate AWS credentials/)
+          end.should raise_error(Mongo::Auth::Aws::CredentialsNotFound, /Could not locate AWS credentials/)
         end
       end
 
@@ -163,7 +163,7 @@ describe 'Client construction with AWS auth' do
   end
 
   context 'credentials specified via instance/task metadata' do
-    require_auth 'aws-ec2', 'aws-ecs'
+    require_auth 'aws-ec2', 'aws-ecs', 'aws-web-identity'
 
     before(:all) do
       # No explicit credentials are expected in the tested configurations
@@ -189,6 +189,15 @@ describe 'Client construction with AWS auth' do
         authenticated_user_name.should =~ /^arn:aws:sts:.*assumed-role.*ecstaskexecutionrole/i
       end
     end
+
+    context 'when using web identity' do
+      require_auth 'aws-web-identity'
+
+      it 'uses the expected user' do
+        puts "Authenticated as #{authenticated_user_name}"
+        authenticated_user_name.should =~ /^arn:aws:sts:.*assumed-role.*webIdentityTestRole/i
+      end
+    end
   end
 
 end

data/spec/integration/client_construction_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -100,6 +100,28 @@ describe 'Client construction' do
         expect(server.description).to be_primary
       end
     end
+
+    # This test requires a PSA deployment. The port number is fixed for our
+    # Evergreen/Docker setups.
+    context 'when directly connecting to arbiters' do
+      let(:options) do
+        SpecConfig.instance.test_options.tap do |opt|
+          opt.delete(:connect)
+          opt.delete(:replica_set)
+          opt.update(direct_connection: true)
+        end
+      end
+
+      let(:client) do
+        new_local_client(['localhost:27019'], options)
+      end
+
+      let(:response) { client.command(ismaster: 1).documents.first }
+
+      it 'connects' do
+        response.fetch('arbiterOnly').should be true
+      end
+    end
   end
 
   context 'in sharded topology' do

data/spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/client_side_encryption/auto_encryption_mongocryptd_spawn_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/client_side_encryption/auto_encryption_old_wire_version_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/client_side_encryption/auto_encryption_reconnect_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -28,7 +28,8 @@ describe 'Client with auto encryption #reconnect' do
             # Spawn mongocryptd on non-default port for sharded cluster tests
             extra_options: extra_options,
           },
-          database: 'auto_encryption'
+          database: 'auto_encryption',
+          populator_io: false
         }
       )
     )
@@ -133,7 +134,9 @@ describe 'Client with auto encryption #reconnect' do
 
     context 'after closing mongocryptd client and reconnecting' do
       before do
-        mongocryptd_client.close
+        # don't use the mongocryptd_client variable yet so that it will be computed
+        # after the client reconnects
+        client.encrypter.mongocryptd_client.close
         client.reconnect
       end
 
@@ -144,7 +147,9 @@ describe 'Client with auto encryption #reconnect' do
 
     context 'after killing mongocryptd client monitor thread and reconnecting' do
       before do
-        thread = mongocryptd_client.cluster.servers.first.monitor.instance_variable_get('@thread')
+        # don't use the mongocryptd_client variable yet so that it will be computed
+        # after the client reconnects
+        thread = client.encrypter.mongocryptd_client.cluster.servers.first.monitor.instance_variable_get('@thread')
         expect(thread).to be_alive
 
         thread.kill
@@ -223,7 +228,7 @@ describe 'Client with auto encryption #reconnect' do
     let(:key_vault_client_option) do
       new_local_client(
         SpecConfig.instance.addresses,
-        SpecConfig.instance.test_options
+        SpecConfig.instance.test_options.merge(populator_io: false)
       )
     end