CSHARP-3335: mongocryptd should allow setting it via the PATH.

Author: DmitryLukyanov

src/MongoDB.Driver/Encryption/MongocryptdFactory.cs

@@ -119,10 +119,10 @@ private bool ShouldMongocryptdBeSpawned(out string path, out string args)
                     path = string.Empty; // look at the PATH env variable
                 }
 
-                if (Directory.Exists(path))
+                if (string.IsNullOrEmpty(path) || Directory.Exists(path))
                 {
                     string fileName = $"mongocryptd{GetMongocryptdExtension()}";
-                    path = Path.Combine(path, fileName);
+                    path = Path.Combine(path ?? "", fileName);
                 }
 
                 args = string.Empty;

tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs

@@ -42,40 +42,43 @@ public void CreateMongocryptdConnectionString_should_create_expected_connection_
 
         [SkippableTheory]
         [InlineData("{ mongocryptdBypassSpawn : true }", null, null, false)]
-        [InlineData(null, "", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
-        [InlineData("{ mongocryptdBypassSpawn : false }", "", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
-        [InlineData("{ mongocryptdBypassSpawn : false }", "", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
+        [InlineData(null, "mongocryptd#extension#", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
+        [InlineData("{ mongocryptdBypassSpawn : false }", "mongocryptd#extension#", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
         [InlineData("{ mongocryptdBypassSpawn : false, mongocryptdSpawnPath : 'c:/mongocryptd.exe' }", "c:/mongocryptd.exe", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
         [InlineData("{ mongocryptdBypassSpawn : false, mongocryptdSpawnPath : 'c:/mgcr.exe' }", "c:/mgcr.exe", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
         [InlineData("{ mongocryptdBypassSpawn : false, mongocryptdSpawnPath : 'c:/mgcr.exe' }", "c:/mgcr.exe", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
         // args string
-        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B' }", "", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
-        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B --idleShutdownTimeoutSecs 50' }", "", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 50 --logpath #logpath# --logappend", true)]
-        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B --logpath path.txt' }", "", "--arg1 A --arg2 B --logpath path.txt --idleShutdownTimeoutSecs 60", true)]
-        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B --logpath path.txt --logappend' }", "", "--arg1 A --arg2 B --logpath path.txt --logappend --idleShutdownTimeoutSecs 60", true)]
-        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B --logappend' }", "", "--arg1 A --arg2 B --logappend --idleShutdownTimeoutSecs 60 --logpath #logpath#", true)]
+        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B' }", "mongocryptd#extension#", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
+        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B --idleShutdownTimeoutSecs 50' }", "mongocryptd#extension#", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 50 --logpath #logpath# --logappend", true)]
+        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B --logpath path.txt' }", "mongocryptd#extension#", "--arg1 A --arg2 B --logpath path.txt --idleShutdownTimeoutSecs 60", true)]
+        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B --logpath path.txt --logappend' }", "mongocryptd#extension#", "--arg1 A --arg2 B --logpath path.txt --logappend --idleShutdownTimeoutSecs 60", true)]
+        [InlineData("{ mongocryptdSpawnArgs : '--arg1 A --arg2 B --logappend' }", "mongocryptd#extension#", "--arg1 A --arg2 B --logappend --idleShutdownTimeoutSecs 60 --logpath #logpath#", true)]
         // args IEnumerable
-        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B'] }", "", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
-        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B', 'idleShutdownTimeoutSecs 50'] }", "", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 50 --logpath #logpath# --logappend", true)]
-        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', '--arg2 B', '--idleShutdownTimeoutSecs 50'] }", "", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 50 --logpath #logpath# --logappend", true)]
-        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B', '--logpath path.txt'] }", "", "--arg1 A --arg2 B --logpath path.txt --idleShutdownTimeoutSecs 60", true)]
-        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B', '--logpath path.txt', '--logappend'] }", "", "--arg1 A --arg2 B --logpath path.txt --logappend --idleShutdownTimeoutSecs 60", true)]
-        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B', '--logappend'] }", "", "--arg1 A --arg2 B --logappend --idleShutdownTimeoutSecs 60 --logpath #logpath#", true)]
-        [InlineData("{ mongocryptdBypassSpawn : false, mongocryptdSpawnArgs : [ '--arg1 A', '--arg2 B', '--idleShutdownTimeoutSecs 50'] }", "", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 50 --logpath #logpath# --logappend", true)]
+        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B'] }", "mongocryptd#extension#", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)]
+        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B', 'idleShutdownTimeoutSecs 50'] }", "mongocryptd#extension#", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 50 --logpath #logpath# --logappend", true)]
+        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', '--arg2 B', '--idleShutdownTimeoutSecs 50'] }", "mongocryptd#extension#", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 50 --logpath #logpath# --logappend", true)]
+        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B', '--logpath path.txt'] }", "mongocryptd#extension#", "--arg1 A --arg2 B --logpath path.txt --idleShutdownTimeoutSecs 60", true)]
+        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B', '--logpath path.txt', '--logappend'] }", "mongocryptd#extension#", "--arg1 A --arg2 B --logpath path.txt --logappend --idleShutdownTimeoutSecs 60", true)]
+        [InlineData("{ mongocryptdSpawnArgs : ['arg1 A', 'arg2 B', '--logappend'] }", "mongocryptd#extension#", "--arg1 A --arg2 B --logappend --idleShutdownTimeoutSecs 60 --logpath #logpath#", true)]
+        [InlineData("{ mongocryptdBypassSpawn : false, mongocryptdSpawnArgs : [ '--arg1 A', '--arg2 B', '--idleShutdownTimeoutSecs 50'] }", "mongocryptd#extension#", "--arg1 A --arg2 B --idleShutdownTimeoutSecs 50 --logpath #logpath# --logappend", true)]
         public void Mongocryptd_should_be_spawned_with_correct_extra_arguments(
             string stringExtraOptions,
             string expectedPath,
             string expectedArgs,
             bool shouldBeSpawned)
         {
             string emptyLogPath;
+            string platformExtension;
 #if WINDOWS
             emptyLogPath = "nul";
+            platformExtension = ".exe";
 #else
             emptyLogPath = "/dev/null";
+            platformExtension = "";
 #endif
             stringExtraOptions = stringExtraOptions?.Replace("#logpath#", emptyLogPath);
             expectedArgs = expectedArgs?.Replace("#logpath#", emptyLogPath);
+            expectedPath = expectedPath?.Replace("#extension#", platformExtension);
 
             var bsonDocumentExtraOptions =
                 stringExtraOptions != null