Remove serverless logic in test runners

Author: alcaeus

tests/FunctionalTestCase.php

@@ -420,16 +420,6 @@ protected function isStandalone()
         return $this->getPrimaryServer()->getType() == Server::TYPE_STANDALONE;
     }
 
-    /**
-     * Return whether serverless (i.e. proxy as mongos) is being utilized.
-     */
-    protected static function isServerless(): bool
-    {
-        $isServerless = getenv('MONGODB_IS_SERVERLESS');
-
-        return $isServerless !== false ? filter_var($isServerless, FILTER_VALIDATE_BOOLEAN) : false;
-    }
-
     protected function isShardedCluster()
     {
         $type = $this->getPrimaryServer()->getType();

tests/SpecTests/FunctionalTestCase.php

@@ -277,12 +277,7 @@ private function isServerlessRequirementSatisfied(?string $serverlessMode): bool
             return true;
         }
 
-        return match ($serverlessMode) {
-            self::SERVERLESS_ALLOW => true,
-            self::SERVERLESS_FORBID => ! static::isServerless(),
-            self::SERVERLESS_REQUIRE => static::isServerless(),
-            default => throw new UnexpectedValueException(sprintf('Invalid serverless requirement "%s" found.', $serverlessMode)),
-        };
+        return $serverlessMode !== self::SERVERLESS_REQUIRE;
     }
 
     /**

tests/UnifiedSpecTests/RunOnRequirement.php

@@ -104,7 +104,7 @@ public function __construct(stdClass $o)
         }
     }
 
-    public function isSatisfied(string $serverVersion, string $topology, ServerParameterHelper $serverParameters, bool $isAuthenticated, bool $isServerless, bool $isClientSideEncryptionSupported): bool
+    public function isSatisfied(string $serverVersion, string $topology, ServerParameterHelper $serverParameters, bool $isAuthenticated, bool $isClientSideEncryptionSupported): bool
     {
         if (isset($this->minServerVersion) && version_compare($serverVersion, $this->minServerVersion, '<')) {
             return false;
@@ -131,14 +131,8 @@ public function isSatisfied(string $serverVersion, string $topology, ServerParam
             return false;
         }
 
-        if (isset($this->serverless)) {
-            if (! $isServerless && $this->serverless === self::SERVERLESS_REQUIRE) {
-                return false;
-            }
-
-            if ($isServerless && $this->serverless === self::SERVERLESS_FORBID) {
-                return false;
-            }
+        if (isset($this->serverless) && $this->serverless === self::SERVERLESS_REQUIRE) {
+            return false;
         }
 
         if (isset($this->csfle) && $isClientSideEncryptionSupported !== $this->csfle) {

tests/UnifiedSpecTests/UnifiedTestRunner.php

@@ -87,7 +87,7 @@ public function __construct(private string $internalClientUri)
          *
          * Atlas Data Lake also does not support killAllSessions.
          */
-        if ($this->isServerless() || FunctionalTestCase::isAtlas($internalClientUri) || $this->isAtlasDataLake()) {
+        if (FunctionalTestCase::isAtlas($internalClientUri) || $this->isAtlasDataLake()) {
             $this->allowKillAllSessions = false;
         }
 
@@ -247,7 +247,6 @@ private function checkRunOnRequirements(array $runOnRequirements): void
                 $this->getTopology(),
                 $this->serverParameterHelper,
                 $this->isAuthenticated(),
-                $this->isServerless(),
                 $this->isClientSideEncryptionSupported(),
             ];
         }
@@ -316,10 +315,6 @@ private function isAtlasDataLake(): bool
 
     /**
      * Return whether the connection is authenticated.
-     *
-     * Note: if the connectionStatus command is not portable for serverless, it
-     * may be necessary to rewrite this to instead inspect the connection string
-     * or consult an environment variable, as is done in libmongoc.
      */
     private function isAuthenticated(): bool
     {
@@ -353,16 +348,6 @@ private function isClientSideEncryptionSupported(): bool
         return FunctionalTestCase::isCryptSharedLibAvailable() || FunctionalTestCase::isMongocryptdAvailable();
     }
 
-    /**
-     * Return whether serverless (i.e. proxy as mongos) is being utilized.
-     */
-    private function isServerless(): bool
-    {
-        $isServerless = getenv('MONGODB_IS_SERVERLESS');
-
-        return $isServerless !== false ? filter_var($isServerless, FILTER_VALIDATE_BOOLEAN) : false;
-    }
-
     /**
      * Checks is a test format schema version is supported.
      */
@@ -530,7 +515,7 @@ private function createContext(): Context
             $context->setUrisForUseMultipleMongoses($singleMongosUri, $multiMongosUri);
         }
 
-        if ($this->getPrimaryServer()->getType() === Server::TYPE_LOAD_BALANCER && ! $this->isServerless()) {
+        if ($this->getPrimaryServer()->getType() === Server::TYPE_LOAD_BALANCER) {
             $singleMongosUri = getenv('MONGODB_SINGLE_MONGOS_LB_URI');
             $multiMongosUri = getenv('MONGODB_MULTI_MONGOS_LB_URI');