Append CRYPT_SHARED_LIB_PATH to autoEncryptionOpts in tests

Author: alcaeus

tests/FunctionalTestCase.php

@@ -85,7 +85,7 @@ public static function createTestClient(?string $uri = null, array $options = []
         return new Client(
             $uri ?? static::getUri(),
             static::appendAuthenticationOptions($options),
-            static::appendServerApiOption($driverOptions),
+            static::appendDriverOptions($driverOptions),
         );
     }
 
@@ -94,7 +94,7 @@ public static function createTestManager(?string $uri = null, array $options = [
         return new Manager(
             $uri ?? static::getUri(),
             static::appendAuthenticationOptions($options),
-            static::appendServerApiOption($driverOptions),
+            static::appendDriverOptions($driverOptions),
         );
     }
 
@@ -603,8 +603,12 @@ private static function appendAuthenticationOptions(array $options): array
         return $options;
     }
 
-    private static function appendServerApiOption(array $driverOptions): array
+    private static function appendDriverOptions(array $driverOptions): array
     {
+        if (isset($driverOptions['autoEncryption']) && getenv('CRYPT_SHARED_LIB_PATH')) {
+            $driverOptions['autoEncryption']['extraOptions']['cryptSharedLibPath'] = getenv('CRYPT_SHARED_LIB_PATH');
+        }
+
         if (getenv('API_VERSION') && ! isset($driverOptions['serverApi'])) {
             $driverOptions['serverApi'] = new ServerApi(getenv('API_VERSION'));
         }

tests/SpecTests/ClientSideEncryption/FunctionalTestCase.php

@@ -27,15 +27,6 @@ public function setUp(): void
         $this->skipIfClientSideEncryptionIsNotSupported();
     }
 
-    public static function createTestClient(?string $uri = null, array $options = [], array $driverOptions = []): Client
-    {
-        if (isset($driverOptions['autoEncryption']) && getenv('CRYPT_SHARED_LIB_PATH')) {
-            $driverOptions['autoEncryption']['extraOptions']['cryptSharedLibPath'] = getenv('CRYPT_SHARED_LIB_PATH');
-        }
-
-        return parent::createTestClient($uri, $options, $driverOptions);
-    }
-
     protected static function getAWSCredentials(): array
     {
         return [

tests/SpecTests/ClientSideEncryptionSpecTest.php

@@ -143,15 +143,6 @@ public static function assertCommandMatches(stdClass $expected, stdClass $actual
         static::assertDocumentsMatch($expected, $actual);
     }
 
-    public static function createTestClient(?string $uri = null, array $options = [], array $driverOptions = []): Client
-    {
-        if (isset($driverOptions['autoEncryption']) && getenv('CRYPT_SHARED_LIB_PATH')) {
-            $driverOptions['autoEncryption']['extraOptions']['cryptSharedLibPath'] = getenv('CRYPT_SHARED_LIB_PATH');
-        }
-
-        return parent::createTestClient($uri, $options, $driverOptions);
-    }
-
     /**
      * Execute an individual test case from the specification.
      *

tests/SpecTests/Context.php

@@ -105,11 +105,6 @@ public static function fromClientSideEncryption(stdClass $test, $databaseName, $
 
                 $autoEncryptionOptions['tlsOptions']->kmip = self::getKmsTlsOptions();
             }
-
-            // Intentionally ignore empty values for CRYPT_SHARED_LIB_PATH
-            if (getenv('CRYPT_SHARED_LIB_PATH')) {
-                $autoEncryptionOptions['extraOptions']['cryptSharedLibPath'] = getenv('CRYPT_SHARED_LIB_PATH');
-            }
         }
 
         if (isset($test->outcome->collection->name)) {