@mongosh/service-provider-core 2.2.15 → 2.3.0

package/AUTHORS

@@ -17,3 +17,4 @@ Martin Rodriguez Reboredo <yakoyoku@gmail.com>
 Kevin Mas Ruiz <kevin.mas@hey.com>
 Hao <shaketbaby@gmail.com>
 Basit <1305718+mabaasit@users.noreply.github.com>
+Alena Khineika <alena.khineika@mongodb.com>

package/lib/admin.d.ts

@@ -18,7 +18,7 @@ export interface CheckMetadataConsistencyOptions {
 }
 export interface ConnectionInfo {
     buildInfo: Document | null;
-    topology: any | null;
+    resolvedHostname?: string;
     extraInfo: (ConnectionExtraInfo & {
         fcv?: string;
     }) | null;

package/lib/connect-info.d.ts

@@ -1,9 +1,7 @@
-export interface ConnectionExtraInfo {
+import type { ConnectionString } from 'mongodb-connection-string-url';
+export type ConnectionExtraInfo = {
     is_atlas?: boolean;
-    is_localhost?: boolean;
-    is_do?: boolean;
     server_version?: string;
-    mongosh_version?: string;
     server_os?: string;
     server_arch?: string;
     is_enterprise?: boolean;
@@ -17,5 +15,16 @@ export interface ConnectionExtraInfo {
     node_version?: string;
     uri: string;
     is_local_atlas?: boolean;
-}
-export default function getConnectExtraInfo(uri: string, mongoshVersion: string, buildInfo: any, atlasVersion: any, topology: any, isLocalAtlas: boolean): ConnectionExtraInfo;
+} & HostInformation;
+export type HostInformation = {
+    is_localhost?: boolean;
+    is_atlas_url?: boolean;
+    is_do_url?: boolean;
+};
+export default function getConnectExtraInfo({ connectionString, buildInfo, atlasVersion, resolvedHostname, isLocalAtlas, }: {
+    connectionString?: ConnectionString;
+    buildInfo: any;
+    atlasVersion: any;
+    resolvedHostname?: string;
+    isLocalAtlas: boolean;
+}): ConnectionExtraInfo;

package/lib/connect-info.js

@@ -4,22 +4,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongodb_build_info_1 = __importDefault(require("mongodb-build-info"));
-function getConnectExtraInfo(uri, mongoshVersion, buildInfo, atlasVersion, topology, isLocalAtlas) {
-    var _a;
+function getHostInformation(host) {
+    if (!host) {
+        return {
+            is_localhost: false,
+            is_do_url: false,
+            is_atlas_url: false,
+        };
+    }
+    if (mongodb_build_info_1.default.isLocalhost(host)) {
+        return {
+            is_localhost: true,
+            is_do_url: false,
+            is_atlas_url: false,
+        };
+    }
+    if (mongodb_build_info_1.default.isDigitalOcean(host)) {
+        return {
+            is_localhost: false,
+            is_do_url: true,
+            is_atlas_url: false,
+        };
+    }
+    return {
+        is_localhost: false,
+        is_do_url: false,
+        is_atlas_url: mongodb_build_info_1.default.isAtlas(host),
+    };
+}
+function getConnectExtraInfo({ connectionString, buildInfo, atlasVersion, resolvedHostname, isLocalAtlas, }) {
+    var _a, _b, _c;
+    const auth_type = (_a = connectionString === null || connectionString === void 0 ? void 0 : connectionString.searchParams.get('authMechanism')) !== null && _a !== void 0 ? _a : undefined;
+    const uri = (_b = connectionString === null || connectionString === void 0 ? void 0 : connectionString.toString()) !== null && _b !== void 0 ? _b : '';
     buildInfo !== null && buildInfo !== void 0 ? buildInfo : (buildInfo = {});
     const { isGenuine: is_genuine, serverName: non_genuine_server_name } = mongodb_build_info_1.default.getGenuineMongoDB(uri);
     const { isDataLake: is_data_federation, dlVersion: dl_version } = mongodb_build_info_1.default.getDataLake(buildInfo);
-    const auth_type = topology.s.credentials
-        ? topology.s.credentials.mechanism
-        : null;
     const { serverOs: server_os, serverArch: server_arch } = mongodb_build_info_1.default.getBuildEnv(buildInfo);
+    const isAtlas = !!(atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) || mongodb_build_info_1.default.isAtlas(uri);
     return {
-        is_atlas: !!(atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) || mongodb_build_info_1.default.isAtlas(uri),
-        is_localhost: mongodb_build_info_1.default.isLocalhost(uri),
-        is_do: mongodb_build_info_1.default.isDigitalOcean(uri),
+        ...getHostInformation(resolvedHostname || uri),
+        is_atlas: isAtlas,
         server_version: buildInfo.version,
         node_version: process.version,
-        mongosh_version: mongoshVersion,
         server_os,
         uri,
         server_arch,
@@ -28,7 +54,7 @@ function getConnectExtraInfo(uri, mongoshVersion, buildInfo, atlasVersion, topol
         is_data_federation,
         is_stream: mongodb_build_info_1.default.isAtlasStream(uri),
         dl_version,
-        atlas_version: (_a = atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) !== null && _a !== void 0 ? _a : null,
+        atlas_version: (_c = atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) !== null && _c !== void 0 ? _c : null,
         is_genuine,
         non_genuine_server_name,
         is_local_atlas: isLocalAtlas,

package/lib/connect-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;AAEA,4EAA8C;AAuB9C,SAAwB,mBAAmB,CACzC,GAAW,EACX,cAAsB,EACtB,SAAc,EACd,YAAiB,EACjB,QAAa,EACb,YAAqB;;IAErB,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,uBAAuB,EAAE,GAClE,4BAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAEtC,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,GAC7D,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,WAAW;QACtC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS;QAClC,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GACpD,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,OAAO;QACL,QAAQ,EAAE,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,IAAI,4BAAY,CAAC,OAAO,CAAC,GAAG,CAAC;QACnE,YAAY,EAAE,4BAAY,CAAC,WAAW,CAAC,GAAG,CAAC;QAC3C,KAAK,EAAE,4BAAY,CAAC,cAAc,CAAC,GAAG,CAAC;QACvC,cAAc,EAAE,SAAS,CAAC,OAAO;QACjC,YAAY,EAAE,OAAO,CAAC,OAAO;QAC7B,eAAe,EAAE,cAAc;QAC/B,SAAS;QACT,GAAG;QACH,WAAW;QACX,aAAa,EAAE,4BAAY,CAAC,YAAY,CAAC,SAAS,CAAC;QACnD,SAAS;QACT,kBAAkB;QAClB,SAAS,EAAE,4BAAY,CAAC,aAAa,CAAC,GAAG,CAAC;QAC1C,UAAU;QACV,aAAa,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,IAAI;QACjD,UAAU;QACV,uBAAuB;QACvB,cAAc,EAAE,YAAY;KAC7B,CAAC;AACJ,CAAC;AAzCD,sCAyCC"}
+{"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;AAEA,4EAA8C;AA2B9C,SAAS,kBAAkB,CAAC,IAAa;IACvC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,4BAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,4BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,4BAAY,CAAC,OAAO,CAAC,IAAI,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,SAAwB,mBAAmB,CAAC,EAC1C,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,YAAY,GAOb;;IACC,MAAM,SAAS,GACb,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,mCAAI,SAAS,CAAC;IACnE,MAAM,GAAG,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;IAE/C,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,uBAAuB,EAAE,GAClE,4BAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAEtC,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,GAC7D,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GACpD,4BAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,IAAI,4BAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1E,OAAO;QACL,GAAG,kBAAkB,CAAC,gBAAgB,IAAI,GAAG,CAAC;QAC9C,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,SAAS,CAAC,OAAO;QACjC,YAAY,EAAE,OAAO,CAAC,OAAO;QAC7B,SAAS;QACT,GAAG;QACH,WAAW;QACX,aAAa,EAAE,4BAAY,CAAC,YAAY,CAAC,SAAS,CAAC;QACnD,SAAS;QACT,kBAAkB;QAClB,SAAS,EAAE,4BAAY,CAAC,aAAa,CAAC,GAAG,CAAC;QAC1C,UAAU;QACV,aAAa,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,IAAI;QACjD,UAAU;QACV,uBAAuB;QACvB,cAAc,EAAE,YAAY;KAC7B,CAAC;AACJ,CAAC;AA9CD,sCA8CC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/service-provider-core",
-  "version": "2.2.15",
+  "version": "2.3.0",
   "description": "MongoDB Shell Core Service Provider Package",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -44,22 +44,23 @@
   },
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.525.0",
-    "@mongosh/errors": "2.2.15",
+    "@mongosh/errors": "2.3.0",
     "bson": "^6.7.0",
     "mongodb": "^6.8.0",
     "mongodb-build-info": "^1.7.2",
-    "mongodb-client-encryption": "^6.0.0"
+    "mongodb-client-encryption": "^6.1.0",
+    "mongodb-connection-string-url": "^3.0.1"
   },
   "optionalDependencies": {
-    "mongodb-client-encryption": "^6.0.0"
+    "mongodb-client-encryption": "^6.1.0"
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-mongosh": "2.2.15",
+    "@mongodb-js/eslint-config-mongosh": "2.3.0",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
-    "@mongodb-js/tsconfig-mongosh": "2.2.15",
+    "@mongodb-js/tsconfig-mongosh": "2.3.0",
     "depcheck": "^1.4.3",
     "eslint": "^7.25.0",
     "prettier": "^2.8.8"
   },
-  "gitHead": "1570f12d8dcdbf4668e2323edc124fd9c467e9f5"
+  "gitHead": "2013159f06f902b4e9a2060df411c6b5646d49d4"
 }

package/src/admin.ts

@@ -45,7 +45,7 @@ export interface CheckMetadataConsistencyOptions {
 
 export interface ConnectionInfo {
   buildInfo: Document | null;
-  topology: any | null;
+  resolvedHostname?: string;
   extraInfo: (ConnectionExtraInfo & { fcv?: string }) | null;
 }
 

package/src/connect-info.spec.ts

@@ -1,5 +1,6 @@
 import { expect } from 'chai';
-import getConnectInfo from './connect-info';
+import getConnectExtraInfo from './connect-info';
+import { ConnectionString } from 'mongodb-connection-string-url';
 
 describe('getConnectInfo', function () {
   const BUILD_INFO = {
@@ -46,30 +47,21 @@ describe('getConnectInfo', function () {
     gitVersion: '8f7e5bdde713391e8123a463895bb7fb660a5ffd',
   };
 
-  const TOPOLOGY_WITH_CREDENTIALS = {
-    s: {
-      credentials: {
-        mechanism: 'LDAP',
-      },
-    },
-  };
-
-  const TOPOLOGY_NO_CREDENTIALS = {
-    s: {},
-  };
-
   const ATLAS_URI =
-    'mongodb+srv://admin:catscatscats@cat-data-sets.cats.example.net/admin';
+    'mongodb+srv://admin:catscatscats@cat-data-sets.cats.mongodb.net/admin';
+
+  const ATLAS_URI_WITH_AUTH =
+    'mongodb+srv://admin:catscatscats@cat-data-sets.cats.mongodb.net/admin?authMechanism=PLAIN&authSource=%24external';
 
   it('reports on an enterprise version >=3.2 of mongodb with credentials', function () {
     const output = {
       is_atlas: true,
+      is_atlas_url: true,
       is_localhost: false,
-      is_do: false,
+      is_do_url: false,
       server_version: '3.2.0-rc2',
-      mongosh_version: '0.0.6',
       is_enterprise: true,
-      auth_type: 'LDAP',
+      auth_type: 'PLAIN',
       is_data_federation: false,
       is_stream: false,
       dl_version: null,
@@ -79,30 +71,29 @@ describe('getConnectInfo', function () {
       server_arch: 'x86_64',
       node_version: process.version,
       server_os: 'osx',
-      uri: ATLAS_URI,
+      uri: ATLAS_URI_WITH_AUTH,
       is_local_atlas: false,
     };
     expect(
-      getConnectInfo(
-        ATLAS_URI,
-        '0.0.6',
-        BUILD_INFO,
-        ATLAS_VERSION,
-        TOPOLOGY_WITH_CREDENTIALS,
-        false
-      )
+      getConnectExtraInfo({
+        connectionString: new ConnectionString(ATLAS_URI_WITH_AUTH),
+        buildInfo: BUILD_INFO,
+        atlasVersion: ATLAS_VERSION,
+        resolvedHostname: 'test-data-sets-00-02-a011bb.mongodb.net',
+        isLocalAtlas: false,
+      })
     ).to.deep.equal(output);
   });
 
   it('reports on an enterprise version >=3.2 of mongodb with no credentials', function () {
     const output = {
       is_atlas: true,
+      is_atlas_url: true,
       is_localhost: false,
-      is_do: false,
+      is_do_url: false,
       server_version: '3.2.0-rc2',
-      mongosh_version: '0.0.6',
       is_enterprise: true,
-      auth_type: null,
+      auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
       dl_version: null,
@@ -116,14 +107,13 @@ describe('getConnectInfo', function () {
       is_local_atlas: false,
     };
     expect(
-      getConnectInfo(
-        ATLAS_URI,
-        '0.0.6',
-        BUILD_INFO,
-        ATLAS_VERSION,
-        TOPOLOGY_NO_CREDENTIALS,
-        false
-      )
+      getConnectExtraInfo({
+        connectionString: new ConnectionString(ATLAS_URI),
+        buildInfo: BUILD_INFO,
+        atlasVersion: ATLAS_VERSION,
+        resolvedHostname: 'test-data-sets-00-02-a011bb.mongodb.net',
+        isLocalAtlas: false,
+      })
     ).to.deep.equal(output);
   });
 
@@ -132,12 +122,12 @@ describe('getConnectInfo', function () {
       'mongodb://atlas-stream-67b8e1cd6d60357be377be7b-1dekw.virginia-usa.a.query.mongodb-dev.net/';
     const output = {
       is_atlas: true,
+      is_atlas_url: true,
       is_localhost: false,
-      is_do: false,
+      is_do_url: false,
       server_version: '3.2.0-rc2',
-      mongosh_version: '0.0.6',
       is_enterprise: true,
-      auth_type: 'LDAP',
+      auth_type: undefined,
       is_data_federation: false,
       is_stream: true,
       dl_version: null,
@@ -151,26 +141,26 @@ describe('getConnectInfo', function () {
       uri: streamUri,
     };
     expect(
-      getConnectInfo(
-        streamUri,
-        '0.0.6',
-        BUILD_INFO,
-        null,
-        TOPOLOGY_WITH_CREDENTIALS,
-        false
-      )
+      getConnectExtraInfo({
+        connectionString: new ConnectionString(streamUri),
+        buildInfo: BUILD_INFO,
+        atlasVersion: null,
+        resolvedHostname:
+          'atlas-stream-67b8e1cd6d60357be377be7b-1dekw.virginia-usa.a.query.mongodb-dev.net',
+        isLocalAtlas: false,
+      })
     ).to.deep.equal(output);
   });
 
   it('reports correct information when an empty uri is passed', function () {
     const output = {
       is_atlas: false,
-      is_localhost: false,
-      is_do: false,
+      is_atlas_url: false,
+      is_localhost: true,
+      is_do_url: false,
       server_version: '3.2.0-rc2',
-      mongosh_version: '0.0.6',
       is_enterprise: true,
-      auth_type: 'LDAP',
+      auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
       dl_version: null,
@@ -184,26 +174,24 @@ describe('getConnectInfo', function () {
       is_local_atlas: true,
     };
     expect(
-      getConnectInfo(
-        '',
-        '0.0.6',
-        BUILD_INFO,
-        null,
-        TOPOLOGY_WITH_CREDENTIALS,
-        true
-      )
+      getConnectExtraInfo({
+        buildInfo: BUILD_INFO,
+        atlasVersion: null,
+        resolvedHostname: 'localhost',
+        isLocalAtlas: true,
+      })
     ).to.deep.equal(output);
   });
 
   it('does not fail when buildInfo is unavailable', function () {
     const output = {
       is_atlas: false,
+      is_atlas_url: false,
       is_localhost: false,
-      is_do: false,
+      is_do_url: false,
       server_version: undefined,
-      mongosh_version: '0.0.6',
       is_enterprise: false,
-      auth_type: 'LDAP',
+      auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
       dl_version: null,
@@ -217,7 +205,11 @@ describe('getConnectInfo', function () {
       is_local_atlas: false,
     };
     expect(
-      getConnectInfo('', '0.0.6', null, null, TOPOLOGY_WITH_CREDENTIALS, false)
+      getConnectExtraInfo({
+        buildInfo: null,
+        atlasVersion: null,
+        isLocalAtlas: false,
+      })
     ).to.deep.equal(output);
   });
 });

package/src/connect-info.ts

@@ -1,13 +1,11 @@
 // ^ segment data is in snake_case: forgive me javascript, for i have sinned.
 
 import getBuildInfo from 'mongodb-build-info';
+import type { ConnectionString } from 'mongodb-connection-string-url';
 
-export interface ConnectionExtraInfo {
+export type ConnectionExtraInfo = {
   is_atlas?: boolean;
-  is_localhost?: boolean;
-  is_do?: boolean;
   server_version?: string;
-  mongosh_version?: string;
   server_os?: string;
   server_arch?: string;
   is_enterprise?: boolean;
@@ -21,16 +19,63 @@ export interface ConnectionExtraInfo {
   node_version?: string;
   uri: string;
   is_local_atlas?: boolean;
+} & HostInformation;
+
+export type HostInformation = {
+  is_localhost?: boolean;
+  is_atlas_url?: boolean;
+  is_do_url?: boolean; // Is digital ocean url.
+};
+
+function getHostInformation(host?: string): HostInformation {
+  if (!host) {
+    return {
+      is_localhost: false,
+      is_do_url: false,
+      is_atlas_url: false,
+    };
+  }
+
+  if (getBuildInfo.isLocalhost(host)) {
+    return {
+      is_localhost: true,
+      is_do_url: false,
+      is_atlas_url: false,
+    };
+  }
+
+  if (getBuildInfo.isDigitalOcean(host)) {
+    return {
+      is_localhost: false,
+      is_do_url: true,
+      is_atlas_url: false,
+    };
+  }
+
+  return {
+    is_localhost: false,
+    is_do_url: false,
+    is_atlas_url: getBuildInfo.isAtlas(host),
+  };
 }
 
-export default function getConnectExtraInfo(
-  uri: string,
-  mongoshVersion: string,
-  buildInfo: any,
-  atlasVersion: any,
-  topology: any,
-  isLocalAtlas: boolean
-): ConnectionExtraInfo {
+export default function getConnectExtraInfo({
+  connectionString,
+  buildInfo,
+  atlasVersion,
+  resolvedHostname,
+  isLocalAtlas,
+}: {
+  connectionString?: ConnectionString;
+  buildInfo: any;
+  atlasVersion: any;
+  resolvedHostname?: string;
+  isLocalAtlas: boolean;
+}): ConnectionExtraInfo {
+  const auth_type =
+    connectionString?.searchParams.get('authMechanism') ?? undefined;
+  const uri = connectionString?.toString() ?? '';
+
   buildInfo ??= {}; // We're currently not getting buildInfo with --apiStrict.
   const { isGenuine: is_genuine, serverName: non_genuine_server_name } =
     getBuildInfo.getGenuineMongoDB(uri);
@@ -38,19 +83,15 @@ export default function getConnectExtraInfo(
   const { isDataLake: is_data_federation, dlVersion: dl_version } =
     getBuildInfo.getDataLake(buildInfo);
 
-  const auth_type = topology.s.credentials
-    ? topology.s.credentials.mechanism
-    : null;
   const { serverOs: server_os, serverArch: server_arch } =
     getBuildInfo.getBuildEnv(buildInfo);
+  const isAtlas = !!atlasVersion?.atlasVersion || getBuildInfo.isAtlas(uri);
 
   return {
-    is_atlas: !!atlasVersion?.atlasVersion || getBuildInfo.isAtlas(uri),
-    is_localhost: getBuildInfo.isLocalhost(uri),
-    is_do: getBuildInfo.isDigitalOcean(uri),
+    ...getHostInformation(resolvedHostname || uri),
+    is_atlas: isAtlas,
     server_version: buildInfo.version,
     node_version: process.version,
-    mongosh_version: mongoshVersion,
     server_os,
     uri,
     server_arch,