fixup: add FCV lookup (also TSE request)

mongodb-js · Sep 21, 2021 · a05ab99 · a05ab99
1 parent 064dab2
commit a05ab99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/service-provider-server/src/cli-service-provider.spec.ts b/packages/service-provider-server/src/cli-service-provider.spec.ts
@@ -856,7 +856,8 @@ describe('CliServiceProvider', () => {
       const info = await serviceProvider.getConnectionInfo();
       expect(info.extraInfo.is_atlas).to.equal(false);
       expect(info.extraInfo.is_localhost).to.equal(true);
-      expect(dbStub.command).to.have.callCount(4);
+      expect(info.extraInfo.fcv).to.equal(undefined);
+      expect(dbStub.command).to.have.callCount(5);
     });
   });
 });
diff --git a/packages/service-provider-server/src/cli-service-provider.ts b/packages/service-provider-server/src/cli-service-provider.ts
@@ -118,7 +118,7 @@ type ConnectionInfo = {
   topology: any;
   extraInfo: ExtraConnectionInfo;
 };
-type ExtraConnectionInfo = ReturnType<typeof getConnectInfo>;
+type ExtraConnectionInfo = ReturnType<typeof getConnectInfo> & { fcv?: string };
 
 /**
  * Default driver options we always use.
@@ -412,9 +412,10 @@ class CliServiceProvider extends ServiceProviderCore implements ServiceProvider
     }
     const topology = this.getTopology();
     const { version } = require('../package.json');
-    const [cmdLineOpts = null, atlasVersion = null] = await Promise.all([
+    const [cmdLineOpts = null, atlasVersion = null, fcv = null] = await Promise.all([
       this.runCommandWithCheck('admin', { getCmdLineOpts: 1 }, this.baseCmdOptions).catch(() => {}),
-      this.runCommandWithCheck('admin', { atlasVersion: 1 }, this.baseCmdOptions).catch(() => {})
+      this.runCommandWithCheck('admin', { atlasVersion: 1 }, this.baseCmdOptions).catch(() => {}),
+      this.runCommandWithCheck('admin', { getParameter: 1, featureCompatibilityVersion: 1 }, this.baseCmdOptions).catch(() => {})
     ]);
 
     const extraConnectionInfo = getConnectInfo(
@@ -429,7 +430,10 @@ class CliServiceProvider extends ServiceProviderCore implements ServiceProvider
     return {
       buildInfo: buildInfo,
       topology: topology,
-      extraInfo: extraConnectionInfo
+      extraInfo: {
+        ...extraConnectionInfo,
+        fcv: fcv?.featureCompatibilityVersion?.version
+      }
     };
   }