PR requested changes

Author: aditi-khare-mongoDB

src/mongo_client.ts

@@ -33,8 +33,13 @@ import type { SrvPoller } from './sdam/srv_polling';
 import { Topology, type TopologyEvents } from './sdam/topology';
 import { ClientSession, type ClientSessionOptions, ServerSessionPool } from './sessions';
 import {
+  COSMOS_DB_CHECK,
+  COSMOS_DB_MSG,
+  DOCUMENT_DB_CHECK,
+  DOCUMENT_DB_MSG,
   type HostAddress,
   hostMatchesWildcards,
+  isHostMatch,
   type MongoDBNamespace,
   ns,
   resolveOptions
@@ -367,40 +372,27 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
     this.checkForNonGenuineHosts();
   }
 
-  DOCUMENT_DB_CHECK = /(\.docdb\.amazonaws\.com$)|(\.docdb-elastic\.amazonaws\.com$)/;
-  COSMOS_DB_CHECK = /\.cosmos\.azure\.com$/;
-
-  static DOCUMENT_DB_MSG =
-    'You appear to be connected to a DocumentDB cluster. For more information regarding feature compatibility and support please visit https://www.mongodb.com/supportability/documentdb';
-  static COSMOS_DB_MSG =
-    'You appear to be connected to a CosmosDB cluster. For more information regarding feature compatibility and support please visit https://www.mongodb.com/supportability/cosmosdb';
-
-  /** @internal */
-  private isHostMatch(match: RegExp, host?: string): boolean {
-    return host && match.test(host.toLowerCase()) ? true : false;
-  }
-
   /** @internal */
   private checkForNonGenuineHosts() {
     if (this.mongoLogger && this.mongoLogger.logDestination) {
       const documentDBHostnames = this[kOptions].hosts.filter((hostAddress: HostAddress) =>
-        this.isHostMatch(this.DOCUMENT_DB_CHECK, hostAddress.host)
+        isHostMatch(DOCUMENT_DB_CHECK, hostAddress.host)
       );
 
-      const srvHostIsDocumentDB = this.isHostMatch(this.DOCUMENT_DB_CHECK, this[kOptions].srvHost);
+      const srvHostIsDocumentDB = isHostMatch(DOCUMENT_DB_CHECK, this[kOptions].srvHost);
 
       if (documentDBHostnames.length !== 0 || srvHostIsDocumentDB) {
-        this.mongoLogger.info('client', MongoClient.DOCUMENT_DB_MSG);
+        this.mongoLogger.info('client', DOCUMENT_DB_MSG);
       }
 
       const cosmosDBHostnames = this[kOptions].hosts.filter((hostAddress: HostAddress) =>
-        this.isHostMatch(this.COSMOS_DB_CHECK, hostAddress.host)
+        isHostMatch(COSMOS_DB_CHECK, hostAddress.host)
       );
 
-      const srvHostIsCosmosDB = this.isHostMatch(this.COSMOS_DB_CHECK, this[kOptions].srvHost);
+      const srvHostIsCosmosDB = isHostMatch(COSMOS_DB_CHECK, this[kOptions].srvHost);
 
       if (cosmosDBHostnames.length !== 0 || srvHostIsCosmosDB) {
-        this.mongoLogger.info('client', MongoClient.COSMOS_DB_MSG);
+        this.mongoLogger.info('client', COSMOS_DB_MSG);
       }
     }
   }

src/utils.ts

@@ -1282,3 +1282,20 @@ export class TimeoutController extends AbortController {
     this.timeoutId = null;
   }
 }
+
+/** @internal */
+export const DOCUMENT_DB_CHECK = /(\.docdb\.amazonaws\.com$)|(\.docdb-elastic\.amazonaws\.com$)/;
+/** @internal */
+export const COSMOS_DB_CHECK = /\.cosmos\.azure\.com$/;
+
+/** @internal */
+export const DOCUMENT_DB_MSG =
+  'You appear to be connected to a DocumentDB cluster. For more information regarding feature compatibility and support please visit https://www.mongodb.com/supportability/documentdb';
+/** @internal */
+export const COSMOS_DB_MSG =
+  'You appear to be connected to a CosmosDB cluster. For more information regarding feature compatibility and support please visit https://www.mongodb.com/supportability/cosmosdb';
+
+/** @internal */
+export function isHostMatch(match: RegExp, host?: string): boolean {
+  return host && match.test(host.toLowerCase()) ? true : false;
+}

test/unit/connection_string.test.ts

@@ -9,7 +9,9 @@ import { inspect } from 'util';
 import {
   AUTH_MECHS_AUTH_SRC_EXTERNAL,
   AuthMechanism,
+  COSMOS_DB_MSG,
   DEFAULT_ALLOWED_HOSTS,
+  DOCUMENT_DB_MSG,
   FEATURE_FLAGS,
   type Log,
   MongoAPIError,
@@ -894,20 +896,22 @@ describe('Connection String', function () {
     });
 
     const loggerFeatureFlag = Symbol.for('@@mdb.enableMongoLogger');
-    const docDBmsg = MongoClient.DOCUMENT_DB_MSG;
-    const cosmosDBmsg = MongoClient.COSMOS_DB_MSG;
     const test_cases = [
       ['non-SRV example uri', 'mongodb://a.example.com:27017,b.example.com:27017/', ''],
       ['non-SRV default uri', 'mongodb://a.mongodb.net:27017', ''],
       ['SRV example uri', 'mongodb+srv://a.example.com/', ''],
       ['SRV default uri', 'mongodb+srv://a.mongodb.net/', ''],
       // ensure case insensitity
-      ['non-SRV cosmosDB uri', 'mongodb://a.mongo.COSmos.aZure.com:19555/', cosmosDBmsg],
-      ['non-SRV documentDB uri', 'mongodb://a.docDB.AmazonAws.com:27017/', docDBmsg],
-      ['non-SRV documentDB uri ', 'mongodb://a.docdB-eLasTic.amazonaws.com:27017/', docDBmsg],
-      ['SRV cosmosDB uri', 'mongodb+srv://a.mongo.COSmos.aZure.com/', cosmosDBmsg],
-      ['SRV documentDB uri', 'mongodb+srv://a.docDB.AmazonAws.com/', docDBmsg],
-      ['SRV documentDB uri 2', 'mongodb+srv://a.docdB-eLastic.amazonaws.com/', docDBmsg]
+      ['non-SRV cosmosDB uri', 'mongodb://a.mongo.COSmos.aZure.com:19555/', COSMOS_DB_MSG],
+      ['non-SRV documentDB uri', 'mongodb://a.docDB.AmazonAws.com:27017/', DOCUMENT_DB_MSG],
+      [
+        'non-SRV documentDB uri ',
+        'mongodb://a.docdB-eLasTic.amazonaws.com:27017/',
+        DOCUMENT_DB_MSG
+      ],
+      ['SRV cosmosDB uri', 'mongodb+srv://a.mongo.COSmos.aZure.com/', COSMOS_DB_MSG],
+      ['SRV documentDB uri', 'mongodb+srv://a.docDB.AmazonAws.com/', DOCUMENT_DB_MSG],
+      ['SRV documentDB uri 2', 'mongodb+srv://a.docdB-eLastic.amazonaws.com/', DOCUMENT_DB_MSG]
     ];
 
     context('when logging is turned on', () => {