feat: enable In-Use Encryption COMPASS-5634 (#3145)

Author: alenakhineika

packages/compass-e2e-tests/helpers/commands/add-collection.ts

@@ -139,11 +139,7 @@ export async function addCollection(
     await expireField.setValue(options.clustered.expireAfterSeconds.toString());
   }
 
-  if (
-    options &&
-    options.encryptedFields &&
-    process.env.COMPASS_CSFLE_SUPPORT === 'true'
-  ) {
+  if (options && options.encryptedFields) {
     await browser.clickVisible(Selectors.CreateCollectionFLE2CheckboxLabel);
     await browser.setAceValue(
       Selectors.CreateCollectionFLE2,

packages/compass-e2e-tests/helpers/commands/set-connect-form-state.ts

@@ -19,7 +19,6 @@ export async function setConnectFormState(
       Selectors.connectionFormSchemeRadio(state.scheme)
     );
   }
-
   if (state.hosts) {
     for (let i = 0; i < state.hosts.length; ++i) {
       if (i > 0) {
@@ -33,7 +32,6 @@ export async function setConnectFormState(
       );
     }
   }
-
   if (state.directConnection) {
     await browser.clickParent(Selectors.ConnectionFormDirectConnectionCheckbox);
   }
@@ -135,39 +133,37 @@ export async function setConnectFormState(
       state.awsSessionToken
     );
   }
-
-  // FLE2
-  if (process.env.COMPASS_CSFLE_SUPPORT === 'true') {
-    await browser.navigateToConnectTab('In-Use Encryption');
-    if (state.fleKeyVaultNamespace) {
-      await browser.setValueVisible(
-        Selectors.ConnectionFormInputFLEKeyVaultNamespace,
-        state.fleKeyVaultNamespace
-      );
-    }
-    if (state.fleKey) {
-      await browser.expandAccordion(Selectors.ConnectionFormInputFLELocalKMS);
-      await browser.setValueVisible(
-        Selectors.ConnectionFormInputFLELocalKey,
-        state.fleKey
-      );
-    }
-    if (state.fleEncryptedFieldsMap) {
-      // set the text in the editor
-      await browser.setAceValue(
-        Selectors.ConnectionFormInputFLEEncryptedFieldsMap,
-        state.fleEncryptedFieldsMap
-      );
-    }
-  }
-
   if (state.awsSessionToken) {
     await browser.setValueVisible(
       Selectors.ConnectionFormInputAWSSessionToken,
       state.awsSessionToken
     );
   }
 
+  // FLE2
+  await browser.navigateToConnectTab('In-Use Encryption');
+
+  if (state.fleKeyVaultNamespace) {
+    await browser.setValueVisible(
+      Selectors.ConnectionFormInputFLEKeyVaultNamespace,
+      state.fleKeyVaultNamespace
+    );
+  }
+  if (state.fleKey) {
+    await browser.expandAccordion(Selectors.ConnectionFormInputFLELocalKMS);
+    await browser.setValueVisible(
+      Selectors.ConnectionFormInputFLELocalKey,
+      state.fleKey
+    );
+  }
+  if (state.fleEncryptedFieldsMap) {
+    // set the text in the editor
+    await browser.setAceValue(
+      Selectors.ConnectionFormInputFLEEncryptedFieldsMap,
+      state.fleEncryptedFieldsMap
+    );
+  }
+
   // TLS/SSL
   await browser.navigateToConnectTab('TLS/SSL');
 
@@ -176,7 +172,6 @@ export async function setConnectFormState(
       Selectors.connectionFormSSLConnectionRadio(state.sslConnection)
     );
   }
-
   if (state.tlsCAFile) {
     await browser.selectFile(
       Selectors.ConnectionFormTlsCaFile,

packages/compass-e2e-tests/tests/connection.test.ts

@@ -692,18 +692,14 @@ describe('System CA access', function () {
 describe('FLE2', function () {
   let compass: Compass;
   let browser: CompassBrowser;
-  let initialEnvVars: NodeJS.ProcessEnv;
 
   before(async function () {
-    initialEnvVars = Object.assign({}, process.env);
-    process.env.COMPASS_CSFLE_SUPPORT = 'true';
     compass = await beforeTests();
     browser = compass.browser;
   });
 
   after(async function () {
     await afterTests(compass, this.currentTest);
-    process.env = initialEnvVars;
   });
 
   it('can connect using local KMS', async function () {

packages/compass-e2e-tests/tests/in-use-encryption.test.ts

@@ -9,8 +9,6 @@ import { createDummyCollections } from '../helpers/insert-data';
 import { getFirstListDocument } from '../helpers/read-first-document-content';
 
 describe('FLE2', function () {
-  let initialEnvVars: NodeJS.ProcessEnv;
-
   before(async function () {
     if (
       semver.lt(MONGODB_VERSION, '6.0.0-rc0') ||
@@ -19,18 +17,9 @@ describe('FLE2', function () {
       return this.skip();
     }
 
-    initialEnvVars = Object.assign({}, process.env);
-    process.env.COMPASS_CSFLE_SUPPORT = 'true';
-
     await createDummyCollections();
   });
 
-  after(function () {
-    if (initialEnvVars) {
-      process.env = initialEnvVars;
-    }
-  });
-
   describe('when fleEncryptedFieldsMap is not specified while connecting', function () {
     const databaseName = 'test';
     const collectionName = 'my-encrypted-collection';

packages/compass/src/index.d.ts

@@ -48,8 +48,6 @@ declare module 'process' {
          */
         COMPASS_SHOW_NEW_TOOLBARS?: 'true' | 'false';
 
-        COMPASS_CSFLE_SUPPORT?: 'true' | 'false';
-
         COMPASS_CLUSTERED_COLLECTIONS?: 'true' | 'false';
 
         /**

packages/connection-form/package.json

@@ -38,9 +38,9 @@
     "depcheck": "depcheck",
     "check": "npm run lint && npm run depcheck",
     "check-ci": "npm run check",
-    "test": "cross-env COMPASS_CSFLE_SUPPORT='true' mocha",
-    "test-electron": "cross-env COMPASS_CSFLE_SUPPORT='true' xvfb-maybe electron-mocha --no-sandbox",
-    "test-cov": "cross-env COMPASS_CSFLE_SUPPORT='true' nyc -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test",
+    "test": "mocha",
+    "test-electron": "xvfb-maybe electron-mocha --no-sandbox",
+    "test-cov": "nyc -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test",
     "test-watch": "npm run test -- --watch",
     "test-ci": "npm run test-cov",
     "test-ci-electron": "npm run test-electron",

packages/connection-form/src/components/advanced-options-tabs/advanced-options-tabs.tsx

@@ -21,8 +21,6 @@ import type { ConnectionFormError, TabId } from '../../utils/validation';
 import { errorsByFieldTab } from '../../utils/validation';
 import { defaultConnectionString } from '../../constants/default-connection';
 
-const csfleFeatureFlag = process?.env?.COMPASS_CSFLE_SUPPORT === 'true';
-
 const tabsStyles = css({
   marginTop: spacing[2],
 });
@@ -72,21 +70,13 @@ function AdvancedOptionsTabs({
     },
     { name: 'TLS/SSL', id: 'tls', component: TLSTab },
     { name: 'Proxy/SSH', id: 'proxy', component: ProxyAndSshTunnelTab },
-    { name: 'Advanced', id: 'advanced', component: AdvancedTab },
-  ];
-
-  if (csfleFeatureFlag) {
-    // Add before advanced
-    tabs.splice(-1, 0, {
+    {
       name: 'In-Use Encryption',
       id: 'csfle',
       component: CSFLETab,
-    });
-    // TODO(COMPASS-5634): Figure out the exact spacing properties
-    // for fitting all the tabs in here.
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    tabs.find((tab) => tab.id === 'proxy')!.name = 'Proxy/SSH';
-  }
+    },
+    { name: 'Advanced', id: 'advanced', component: AdvancedTab },
+  ];
 
   const connectionStringUrl = useMemo(() => {
     try {

packages/connection-form/src/components/connect-form.tsx

@@ -27,13 +27,11 @@ import { useConnectForm } from '../hooks/use-connect-form';
 import { validateConnectionOptionsErrors } from '../utils/validation';
 import SaveConnectionModal from './save-connection-modal';
 
-const csfleFeatureFlag = process?.env?.COMPASS_CSFLE_SUPPORT === 'true';
-
 const formContainerStyles = css({
   margin: 0,
   padding: 0,
   height: 'fit-content',
-  width: spacing[6] * (10 + (csfleFeatureFlag ? 2 : 0)),
+  width: spacing[6] * 12,
   position: 'relative',
   display: 'inline-block',
 });

packages/data-service/src/data-service.spec.ts

@@ -244,8 +244,7 @@ describe('DataService', function () {
         });
         if (
           (buildInfo.versionArray?.[0] ?? 0) <= 5 ||
-          dataService.currentTopologyType() === 'Single' ||
-          process.env.COMPASS_CSFLE_SUPPORT !== 'true'
+          dataService.currentTopologyType() === 'Single'
         ) {
           return this.skip(); // FLE2 requires 6.0+ replset
         }

packages/databases-collections/src/components/collection-fields/has-fle2-support.js

@@ -3,12 +3,6 @@ import semver from 'semver';
 const MIN_FLE2_SERVER_VERSION = '6.0.0-alpha0';
 
 export default function hasFLE2Support(serverVersion, currentTopologyType, configuredKMSProviders) {
-  const fle2FeatureFlag = process?.env?.COMPASS_CSFLE_SUPPORT === 'true';
-
-  if (!fle2FeatureFlag) {
-    return false;
-  }
-
   if (currentTopologyType === 'Single') {
     return false;
   }