CSHARP-3660: Updated server error codes and internal/private variables/fields/methods to use modern terminology. (#534)

Author: JamesKovacs

src/MongoDB.Driver.Core/Core/Authentication/DefaultAuthenticator.cs

@@ -25,9 +25,9 @@ namespace MongoDB.Driver.Core.Authentication
 {
     /// <summary>
     /// The default authenticator.
-    /// If saslSupportedMechs is not present in the isMaster results for mechanism negotiation
+    /// If saslSupportedMechs is not present in the hello or legacy hello results for mechanism negotiation
     /// uses SCRAM-SHA-1 when talking to servers >= 3.0. Prior to server 3.0, uses MONGODB-CR.
-    /// Else, uses SCRAM-SHA-256 if present in the list of mechanisms. Otherwise, uses 
+    /// Else, uses SCRAM-SHA-256 if present in the list of mechanisms. Otherwise, uses
     /// SCRAM-SHA-1 the default, regardless of whether SCRAM-SHA-1 is in the list.
     /// </summary>
     public class DefaultAuthenticator : IAuthenticator
@@ -82,18 +82,18 @@ public void Authenticate(IConnection connection, ConnectionDescription descripti
             Ensure.IsNotNull(description, nameof(description));
 
             // If we don't have SaslSupportedMechs as part of the response, that means we didn't piggyback the initial
-            // isMaster request and should query the server (provided that the server >= 4.0), merging results into 
+            // hello or legacy hello request and should query the server (provided that the server >= 4.0), merging results into
             // a new ConnectionDescription
             if (!description.IsMasterResult.HasSaslSupportedMechs
                 && Feature.ScramSha256Authentication.IsSupported(description.ServerVersion))
             {
-                var command = CustomizeInitialIsMasterCommand(IsMasterHelper.CreateCommand());
-                var isMasterProtocol = IsMasterHelper.CreateProtocol(command, _serverApi);
-                var isMasterResult = IsMasterHelper.GetResult(connection, isMasterProtocol, cancellationToken);
-                var mergedIsMasterResult = new IsMasterResult(description.IsMasterResult.Wrapped.Merge(isMasterResult.Wrapped));
+                var command = CustomizeInitialIsMasterCommand(HelloHelper.CreateCommand());
+                var helloProtocol = HelloHelper.CreateProtocol(command, _serverApi);
+                var helloResult = HelloHelper.GetResult(connection, helloProtocol, cancellationToken);
+                var mergedHelloResult = new IsMasterResult(description.IsMasterResult.Wrapped.Merge(helloResult.Wrapped));
                 description = new ConnectionDescription(
                     description.ConnectionId,
-                    mergedIsMasterResult,
+                    mergedHelloResult,
                     description.BuildInfoResult);
             }
 
@@ -108,18 +108,18 @@ public async Task AuthenticateAsync(IConnection connection, ConnectionDescriptio
             Ensure.IsNotNull(description, nameof(description));
 
             // If we don't have SaslSupportedMechs as part of the response, that means we didn't piggyback the initial
-            // isMaster request and should query the server (provided that the server >= 4.0), merging results into 
+            // hello or legacy hello request and should query the server (provided that the server >= 4.0), merging results into
             // a new ConnectionDescription
             if (!description.IsMasterResult.HasSaslSupportedMechs
                 && Feature.ScramSha256Authentication.IsSupported(description.ServerVersion))
             {
-                var command = CustomizeInitialIsMasterCommand(IsMasterHelper.CreateCommand());
-                var isMasterProtocol = IsMasterHelper.CreateProtocol(command, _serverApi);
-                var isMasterResult = await IsMasterHelper.GetResultAsync(connection, isMasterProtocol, cancellationToken).ConfigureAwait(false);
-                var mergedIsMasterResult = new IsMasterResult(description.IsMasterResult.Wrapped.Merge(isMasterResult.Wrapped));
+                var command = CustomizeInitialIsMasterCommand(HelloHelper.CreateCommand());
+                var helloProtocol = HelloHelper.CreateProtocol(command, _serverApi);
+                var helloResult = await HelloHelper.GetResultAsync(connection, helloProtocol, cancellationToken).ConfigureAwait(false);
+                var mergedHelloResult = new IsMasterResult(description.IsMasterResult.Wrapped.Merge(helloResult.Wrapped));
                 description = new ConnectionDescription(
                     description.ConnectionId,
-                    mergedIsMasterResult,
+                    mergedHelloResult,
                     description.BuildInfoResult);
             }
 
@@ -144,7 +144,7 @@ private static BsonDocument CreateSaslSupportedMechsRequest(string authenticatio
         // see https://github.com/mongodb/specifications/blob/master/source/auth/auth.rst#defaults
         private IAuthenticator CreateAuthenticator(IConnection connection, ConnectionDescription description)
         {
-            // If a saslSupportedMechs field was present in the isMaster results for mechanism negotiation,
+            // If a saslSupportedMechs field was present in the hello or legacy hello results for mechanism negotiation,
             // then it MUST be inspected to select a default mechanism.
             if (description.IsMasterResult.HasSaslSupportedMechs)
             {
@@ -154,7 +154,7 @@ private IAuthenticator CreateAuthenticator(IConnection connection, ConnectionDes
                     ? (IAuthenticator)new ScramSha256Authenticator(_credential, _randomStringGenerator, _serverApi)
                     : new ScramSha1Authenticator(_credential, _randomStringGenerator, _serverApi);
             }
-            // If saslSupportedMechs is not present in the isMaster results for mechanism negotiation, then SCRAM-SHA-1
+            // If saslSupportedMechs is not present in the hello or legacy hello results for mechanism negotiation, then SCRAM-SHA-1
             // MUST be used when talking to servers >= 3.0. Prior to server 3.0, MONGODB-CR MUST be used.
 #pragma warning disable 618
             return Feature.ScramSha1Authentication.IsSupported(description.ServerVersion)
@@ -165,7 +165,7 @@ private IAuthenticator CreateAuthenticator(IConnection connection, ConnectionDes
 
         private IAuthenticator GetOrCreateAuthenticator(IConnection connection, ConnectionDescription description)
         {
-            /* It is possible to have for IsMaster["SpeculativeAuthenticate"] != null and for
+            /* It is possible to have Hello["SpeculativeAuthenticate"] != null and for
              * _speculativeScramSha256Authenticator to be null in the case of multiple authenticators */
             var speculativeAuthenticateResult = description.IsMasterResult.SpeculativeAuthenticate;
             var canUseSpeculativeAuthenticator = _speculativeAuthenticator != null && speculativeAuthenticateResult != null;

src/MongoDB.Driver.Core/Core/Authentication/MongoDBCRAuthenticator.cs

@@ -137,7 +137,7 @@ private CommandWireProtocol<BsonDocument> CreateAuthenticateProtocol(BsonDocumen
             var protocol = new CommandWireProtocol<BsonDocument>(
                 databaseNamespace: new DatabaseNamespace(_credential.Source),
                 command: command,
-                slaveOk: true,
+                secondaryOk: true,
                 resultSerializer: BsonDocumentSerializer.Instance,
                 messageEncoderSettings: null,
                 serverApi: _serverApi);
@@ -156,7 +156,7 @@ private CommandWireProtocol<BsonDocument> CreateGetNonceProtocol()
             var protocol = new CommandWireProtocol<BsonDocument>(
                 databaseNamespace: new DatabaseNamespace(_credential.Source),
                 command: command,
-                slaveOk: true,
+                secondaryOk: true,
                 resultSerializer: BsonDocumentSerializer.Instance,
                 messageEncoderSettings: null,
                 serverApi: _serverApi);

src/MongoDB.Driver.Core/Core/Authentication/MongoDBX509Authenticator.cs

@@ -147,7 +147,7 @@ private CommandWireProtocol<BsonDocument> CreateAuthenticateProtocol()
             var protocol = new CommandWireProtocol<BsonDocument>(
                 databaseNamespace: new DatabaseNamespace("$external"),
                 command: command,
-                slaveOk: true,
+                secondaryOk: true,
                 resultSerializer: BsonDocumentSerializer.Instance,
                 messageEncoderSettings: null,
                 serverApi: _serverApi);

src/MongoDB.Driver.Core/Core/Authentication/SaslAuthenticator.cs

@@ -175,7 +175,7 @@ private CommandWireProtocol<BsonDocument> CreateCommandProtocol(BsonDocument com
             return new CommandWireProtocol<BsonDocument>(
                 databaseNamespace: new DatabaseNamespace(DatabaseName),
                 command: command,
-                slaveOk: true,
+                secondaryOk: true,
                 resultSerializer: BsonDocumentSerializer.Instance,
                 messageEncoderSettings: null,
                 serverApi: _serverApi);

src/MongoDB.Driver.Core/Core/Bindings/IChannel.cs

@@ -49,7 +49,7 @@ public interface IChannel : IDisposable
         /// <param name="command">The command.</param>
         /// <param name="commandValidator">The command validator.</param>
         /// <param name="responseHandling">The response handling.</param>
-        /// <param name="slaveOk">if set to <c>true</c> sets the SlaveOk bit to true in the command message sent to the server.</param>
+        /// <param name="secondaryOk">if set to <c>true</c> sets the SecondaryOk bit to true in the command message sent to the server.</param>
         /// <param name="resultSerializer">The result serializer.</param>
         /// <param name="messageEncoderSettings">The message encoder settings.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
@@ -60,7 +60,7 @@ TResult Command<TResult>(
             BsonDocument command,
             IElementNameValidator commandValidator,
             Func<CommandResponseHandling> responseHandling,
-            bool slaveOk,
+            bool secondaryOk,
             IBsonSerializer<TResult> resultSerializer,
             MessageEncoderSettings messageEncoderSettings,
             CancellationToken cancellationToken);
@@ -76,7 +76,7 @@ TResult Command<TResult>(
         /// <param name="commandValidator">The command validator.</param>
         /// <param name="additionalOptions">The additional options.</param>
         /// <param name="responseHandling">The response handling.</param>
-        /// <param name="slaveOk">if set to <c>true</c> sets the SlaveOk bit to true in the command message sent to the server.</param>
+        /// <param name="secondaryOk">if set to <c>true</c> sets the SecondaryOk bit to true in the command message sent to the server.</param>
         /// <param name="resultSerializer">The result serializer.</param>
         /// <param name="messageEncoderSettings">The message encoder settings.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
@@ -92,7 +92,7 @@ TResult Command<TResult>(
             IElementNameValidator commandValidator,
             BsonDocument additionalOptions,
             Func<CommandResponseHandling> responseHandling,
-            bool slaveOk,
+            bool secondaryOk,
             IBsonSerializer<TResult> resultSerializer,
             MessageEncoderSettings messageEncoderSettings,
             CancellationToken cancellationToken);
@@ -138,7 +138,7 @@ TResult Command<TResult>(
         /// <param name="command">The command.</param>
         /// <param name="commandValidator">The command validator.</param>
         /// <param name="responseHandling">The response handling.</param>
-        /// <param name="slaveOk">if set to <c>true</c> sets the SlaveOk bit to true in the command message sent to the server.</param>
+        /// <param name="secondaryOk">if set to <c>true</c> sets the SecondaryOk bit to true in the command message sent to the server.</param>
         /// <param name="resultSerializer">The result serializer.</param>
         /// <param name="messageEncoderSettings">The message encoder settings.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
@@ -149,7 +149,7 @@ Task<TResult> CommandAsync<TResult>(
             BsonDocument command,
             IElementNameValidator commandValidator,
             Func<CommandResponseHandling> responseHandling,
-            bool slaveOk,
+            bool secondaryOk,
             IBsonSerializer<TResult> resultSerializer,
             MessageEncoderSettings messageEncoderSettings,
             CancellationToken cancellationToken);
@@ -165,7 +165,7 @@ Task<TResult> CommandAsync<TResult>(
         /// <param name="commandValidator">The command validator.</param>
         /// <param name="additionalOptions">The additional options.</param>
         /// <param name="responseHandling">The response handling.</param>
-        /// <param name="slaveOk">if set to <c>true</c> sets the SlaveOk bit to true in the command message sent to the server.</param>
+        /// <param name="secondaryOk">if set to <c>true</c> sets the SecondaryOk bit to true in the command message sent to the server.</param>
         /// <param name="resultSerializer">The result serializer.</param>
         /// <param name="messageEncoderSettings">The message encoder settings.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
@@ -181,7 +181,7 @@ Task<TResult> CommandAsync<TResult>(
             IElementNameValidator commandValidator,
             BsonDocument additionalOptions,
             Func<CommandResponseHandling> responseHandling,
-            bool slaveOk,
+            bool secondaryOk,
             IBsonSerializer<TResult> resultSerializer,
             MessageEncoderSettings messageEncoderSettings,
             CancellationToken cancellationToken);
@@ -384,7 +384,7 @@ Task KillCursorsAsync(
         /// <param name="queryValidator">The query validator.</param>
         /// <param name="skip">The number of documents to skip.</param>
         /// <param name="batchSize">The size of a batch.</param>
-        /// <param name="slaveOk">if set to <c>true</c> sets the SlaveOk bit to true in the query message sent to the server.</param>
+        /// <param name="secondaryOk">if set to <c>true</c> sets the SecondaryOk bit to true in the query message sent to the server.</param>
         /// <param name="partialOk">if set to <c>true</c> the server is allowed to return partial results if any shards are unavailable.</param>
         /// <param name="noCursorTimeout">if set to <c>true</c> the server will not timeout the cursor.</param>
         /// <param name="tailableCursor">if set to <c>true</c> the query should return a tailable cursor.</param>
@@ -400,7 +400,7 @@ CursorBatch<TDocument> Query<TDocument>(
             IElementNameValidator queryValidator,
             int skip,
             int batchSize,
-            bool slaveOk,
+            bool secondaryOk,
             bool partialOk,
             bool noCursorTimeout,
             bool tailableCursor,
@@ -419,7 +419,7 @@ CursorBatch<TDocument> Query<TDocument>(
         /// <param name="queryValidator">The query validator.</param>
         /// <param name="skip">The number of documents to skip.</param>
         /// <param name="batchSize">The size of a batch.</param>
-        /// <param name="slaveOk">if set to <c>true</c> sets the SlaveOk bit to true in the query message sent to the server.</param>
+        /// <param name="secondaryOk">if set to <c>true</c> sets the SecondaryOk bit to true in the query message sent to the server.</param>
         /// <param name="partialOk">if set to <c>true</c> the server is allowed to return partial results if any shards are unavailable.</param>
         /// <param name="noCursorTimeout">if set to <c>true</c> the server will not timeout the cursor.</param>
         /// <param name="oplogReplay">if set to <c>true</c> the OplogReplay bit will be set.</param>
@@ -437,7 +437,7 @@ CursorBatch<TDocument> Query<TDocument>(
             IElementNameValidator queryValidator,
             int skip,
             int batchSize,
-            bool slaveOk,
+            bool secondaryOk,
             bool partialOk,
             bool noCursorTimeout,
             bool oplogReplay, // obsolete: OplogReplay is ignored by server versions 4.4.0 and newer
@@ -457,7 +457,7 @@ CursorBatch<TDocument> Query<TDocument>(
         /// <param name="queryValidator">The query validator.</param>
         /// <param name="skip">The number of documents to skip.</param>
         /// <param name="batchSize">The size of a batch.</param>
-        /// <param name="slaveOk">if set to <c>true</c> sets the SlaveOk bit to true in the query message sent to the server.</param>
+        /// <param name="secondaryOk">if set to <c>true</c> sets the SecondaryOk bit to true in the query message sent to the server.</param>
         /// <param name="partialOk">if set to <c>true</c> the server is allowed to return partial results if any shards are unavailable.</param>
         /// <param name="noCursorTimeout">if set to <c>true</c> the server will not timeout the cursor.</param>
         /// <param name="tailableCursor">if set to <c>true</c> the query should return a tailable cursor.</param>
@@ -473,7 +473,7 @@ Task<CursorBatch<TDocument>> QueryAsync<TDocument>(
             IElementNameValidator queryValidator,
             int skip,
             int batchSize,
-            bool slaveOk,
+            bool secondaryOk,
             bool partialOk,
             bool noCursorTimeout,
             bool tailableCursor,
@@ -492,7 +492,7 @@ Task<CursorBatch<TDocument>> QueryAsync<TDocument>(
         /// <param name="queryValidator">The query validator.</param>
         /// <param name="skip">The number of documents to skip.</param>
         /// <param name="batchSize">The size of a batch.</param>
-        /// <param name="slaveOk">if set to <c>true</c> sets the SlaveOk bit to true in the query message sent to the server.</param>
+        /// <param name="secondaryOk">if set to <c>true</c> sets the SecondaryOk bit to true in the query message sent to the server.</param>
         /// <param name="partialOk">if set to <c>true</c> the server is allowed to return partial results if any shards are unavailable.</param>
         /// <param name="noCursorTimeout">if set to <c>true</c> the server will not timeout the cursor.</param>
         /// <param name="oplogReplay">if set to <c>true</c> the OplogReplay bit will be set.</param>
@@ -510,7 +510,7 @@ Task<CursorBatch<TDocument>> QueryAsync<TDocument>(
             IElementNameValidator queryValidator,
             int skip,
             int batchSize,
-            bool slaveOk,
+            bool secondaryOk,
             bool partialOk,
             bool noCursorTimeout,
             bool oplogReplay, // obsolete: OplogReplay is ignored by server versions 4.4.0 and newer