Use identifyServerName instead of getGenuineMongoDB

Author: kraenhansen

packages/compass-connections/src/stores/connections-store-redux.ts

@@ -28,7 +28,7 @@ import {
 import { getNotificationTriggers } from '../components/connection-status-notifications';
 import { openToast, showConfirmation } from '@mongodb-js/compass-components';
 import { adjustConnectionOptionsBeforeConnect } from '@mongodb-js/connection-form';
-import mongodbBuildInfo, { getGenuineMongoDB } from 'mongodb-build-info';
+import { isAtlasStream } from 'mongodb-build-info';
 import EventEmitter from 'events';
 import { showNonGenuineMongoDBWarningModal as _showNonGenuineMongoDBWarningModal } from '../components/non-genuine-connection-modal';
 import { showEndOfLifeMongoDBWarningModal as _showEndOfLifeMongoDBWarningModal } from '../components/end-of-life-connection-modal';
@@ -1416,13 +1416,13 @@ function isAtlasStreamsInstance(
   adjustedConnectionInfoForConnection: ConnectionInfo
 ) {
   try {
-    return mongodbBuildInfo.isAtlasStream(
+    return isAtlasStream(
       adjustedConnectionInfoForConnection.connectionOptions.connectionString
     );
   } catch {
     // This catch-all is not ideal, but it safe-guards regular connections
     // instead of making assumptions on the fact that the implementation
-    // of `mongodbBuildInfo.isAtlasStream` would never throw.
+    // of `isAtlasStream` would never throw.
     return false;
   }
 }
@@ -1888,10 +1888,7 @@ const connectWithOptions = (
           connectionId: connectionInfo.id,
         });
 
-        if (
-          getGenuineMongoDB(connectionInfo.connectionOptions.connectionString)
-            .isGenuine === false
-        ) {
+        if (!instanceInfo.genuineMongoDB.isGenuine) {
           dispatch(showNonGenuineMongoDBWarningModal(connectionInfo.id));
         } else if (
           await shouldShowEndOfLifeWarning(

packages/data-service/src/instance-detail-helper.ts

@@ -7,7 +7,7 @@ import type {
 } from 'mongodb';
 import {
   isEnterprise,
-  getGenuineMongoDB,
+  identifyServerName,
   getDataLake,
   isAtlas as checkIsAtlas,
   isLocalAtlas as checkIsLocalAtlas,
@@ -122,6 +122,7 @@ export async function getInstance(
     getParameterResult,
     atlasVersionResult,
     isLocalAtlas,
+    genuineMongoDB,
   ] = await Promise.all([
     runCommand(
       adminDb,
@@ -158,6 +159,7 @@ export async function getInstance(
         return await client.db(db).collection(collection).countDocuments(query);
       }
     ),
+    buildGenuineMongoDBInfo(uri, client),
   ]);
 
   const isAtlas = !!atlasVersionResult.atlasVersion || checkIsAtlas(uri);
@@ -166,8 +168,8 @@ export async function getInstance(
     auth: adaptAuthInfo(connectionStatus),
     build: adaptBuildInfo(buildInfoResult),
     host: adaptHostInfo(hostInfoResult),
-    genuineMongoDB: buildGenuineMongoDBInfo(uri),
     dataLake: buildDataLakeInfo(buildInfoResult),
+    genuineMongoDB,
     featureCompatibilityVersion:
       getParameterResult?.featureCompatibilityVersion.version ?? null,
     isAtlas,
@@ -196,8 +198,24 @@ export function configuredKMSProviders(
     .map(([kmsProviderName]) => kmsProviderName as any);
 }
 
-function buildGenuineMongoDBInfo(uri: string): GenuineMongoDBDetails {
-  const { isGenuine, serverName } = getGenuineMongoDB(uri);
+async function buildGenuineMongoDBInfo(
+  uri: string,
+  client: MongoClient
+): Promise<GenuineMongoDBDetails> {
+  const adminDb = client.db('admin');
+  const serverName = await identifyServerName({
+    connectionString: uri,
+    async adminCommand(doc) {
+      try {
+        const result = await adminDb.command(doc);
+        debug('adminCommand(%O) = %O', doc, result);
+        return result;
+      } catch (err) {
+        debug('adminCommand(%O) failed %O', doc, err);
+        throw err;
+      }
+    },
+  });
 
   return {
     isGenuine: serverName === 'mongodb',