chore: replace references to CSFLE with “In-Use Encryption” COMPASS-5829 (#3105)

addaleax · web-flow · commit 5c1b85bdb425 · 2022-05-18T10:39:44.000+02:00
diff --git a/packages/compass-components/src/components/document-list/document.spec.tsx b/packages/compass-components/src/components/document-list/document.spec.tsx
@@ -150,7 +150,7 @@ describe('Document', function () {
     };
     doc = new HadronDocument(obj);
     render(<Document value={doc}></Document>);
-    expect(screen.getAllByTitle('Encrypted with CSFLE')).to.have.lengthOf(2);
+    expect(screen.getAllByTitle('Encrypted Field')).to.have.lengthOf(2);
   });
 
   it('should allow editing the null value (COMPASS-5697)', function () {
diff --git a/packages/compass-components/src/components/document-list/element.tsx b/packages/compass-components/src/components/document-list/element.tsx
@@ -486,7 +486,7 @@ export const HadronElement: React.FunctionComponent<{
             value.decrypted && (
               <span
                 data-test-id="hadron-document-element-decrypted-icon"
-                title="Encrypted with CSFLE"
+                title="Encrypted Field"
               >
                 <Icon glyph="Key" size="small" />
               </span>
diff --git a/packages/compass-crud/src/components/insert-csfle-warning-banner.jsx b/packages/compass-crud/src/components/insert-csfle-warning-banner.jsx
@@ -22,7 +22,7 @@ function InsertCSFLEWarningBanner({ csfleState }) {
       return (
         <Banner variant={BannerVariant.Warning}>
           This insert operation will not encrypt any document fields because
-          no schema or CSFLE configuration is associated with the collection.
+          no schema or In-Use Encryption configuration is associated with the collection.
         </Banner>
       );
 
@@ -40,7 +40,7 @@ function InsertCSFLEWarningBanner({ csfleState }) {
       return (
         <Banner variant={BannerVariant.Info}>
           This insert operation will encrypt all fields that are specified in the schema
-          or CSFLE configuration associated with the collection.
+          or In-Use Encryption configuration associated with the collection.
 
           {fieldsNotice}
         </Banner>
@@ -50,7 +50,7 @@ function InsertCSFLEWarningBanner({ csfleState }) {
       return (
         <Banner variant={BannerVariant.Warning}>
           This insert operation will not encrypt any document fields because
-          CSFLE support was explicitly disabled.
+          In-Use Encryption support was explicitly disabled.
         </Banner>
       );
 
diff --git a/packages/compass-crud/src/components/table-view/cell-renderer.jsx b/packages/compass-crud/src/components/table-view/cell-renderer.jsx
@@ -207,7 +207,7 @@ class CellRenderer extends React.Component {
           this.props.value.decrypted && (
             <span
               data-test-id="hadron-document-element-decrypted-icon"
-              title="Encrypted with CSFLE"
+              title="Encrypted Field"
             >
               <Icon glyph="Key" size="small" />
             </span>
diff --git a/packages/compass-sidebar/src/components/csfle-connection-modal/csfle-connection-modal.jsx b/packages/compass-sidebar/src/components/csfle-connection-modal/csfle-connection-modal.jsx
@@ -22,14 +22,14 @@ const csfleBannerStyles = css({
 function CSFLEConnectionModal({ csfleMode, open, setOpen, setConnectionIsCSFLEEnabled }) {
   return (<Modal
     open={open}
-    title="Client-Side Field-Level Encryption"
+    title="In-Use Encryption"
     trackingId="csfle_connection_modal"
     setOpen={setOpen}
   >
     <div>
-      <ModalTitle>CSFLE Connection Options</ModalTitle>
+      <ModalTitle>In-Use Encryption Connection Options</ModalTitle>
       <Body>
-          This connection is configured with Client-Side Field-Level Encryption enabled.
+          This connection is configured with In-Use Encryption enabled.
       </Body>
       <div className={toggleContainerStyles}>
         <Toggle
@@ -47,18 +47,19 @@ function CSFLEConnectionModal({ csfleMode, open, setOpen, setConnectionIsCSFLEEn
           id="set-csfle-enabled-label"
           htmlFor="set-csfle-enabled"
         >
-            Enable CSFLE for this connection
+            Enable In-Use Encryption for this connection
         </Label>
       </div>
       <Description>
-          Disabling CSFLE only affects how Compass accesses data.
+          Disabling In-Use Encryption only affects how Compass accesses data.
           In order to make Compass forget KMS credentials, the
           connection must be fully closed.
       </Description>
     </div>
     <Banner className={csfleBannerStyles}>
-        Client-side Field-Level Encryption is an Enterprise/Atlas-only feature
+        In-Use Encryption is an Enterprise/Atlas-only feature
         of MongoDB.&nbsp;
+      {/* TODO(COMPASS-5777): Use generic In-Use Encryption documentation URL instead of FLE1-specific one */}
       <Link href="https://www.mongodb.com/docs/drivers/security/client-side-field-level-encryption-guide/">
           Learn More
       </Link>
diff --git a/packages/compass-sidebar/src/components/csfle-marker/csfle-marker.jsx b/packages/compass-sidebar/src/components/csfle-marker/csfle-marker.jsx
@@ -34,8 +34,8 @@ function CSFLEMarker({ csfleMode, toggleCSFLEModalVisible }) {
   const buttonProps = mergeProps(
     {
       type: 'button',
-      'aria-label': 'Open connection CSFLE configuration',
-      title: 'Connection CSFLE configuration',
+      'aria-label': 'Open connection In-Use Encryption configuration',
+      title: 'Connection In-Use Encryption configuration',
       className: badgeButtonStyles,
       onClick: () => toggleCSFLEModalVisible()
     },
@@ -47,7 +47,7 @@ function CSFLEMarker({ csfleMode, toggleCSFLEModalVisible }) {
       <button {...buttonProps}>
         <Badge variant={csfleMode === 'enabled' ? BadgeVariant.DarkGray : BadgeVariant.LightGray}>
           <Icon glyph="Key" />
-          CSFLE
+          In-Use Encryption
         </Badge>
       </button>
     </div>
diff --git a/packages/connection-form/src/components/advanced-options-tabs/advanced-options-tabs.tsx b/packages/connection-form/src/components/advanced-options-tabs/advanced-options-tabs.tsx
@@ -77,7 +77,11 @@ function AdvancedOptionsTabs({
 
   if (csfleFeatureFlag) {
     // Add before advanced
-    tabs.splice(-1, 0, { name: 'CSFLE', id: 'csfle', component: CSFLETab });
+    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
diff --git a/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.tsx b/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.tsx
@@ -117,8 +117,8 @@ function CSFLETab({
   return (
     <div className={containerStyles}>
       <Banner>
-        Client-side Field-Level Encryption is an Enterprise/Atlas-only feature
-        of MongoDB.&nbsp;
+        In-Use Encryption is an Enterprise/Atlas-only feature of MongoDB.&nbsp;
+        {/* TODO(COMPASS-5777): Use generic In-Use Encryption documentation URL instead of FLE1-specific one */}
         <Link href="https://www.mongodb.com/docs/drivers/security/client-side-field-level-encryption-guide/">
           Learn More
         </Link>
diff --git a/packages/connection-form/src/components/connect-form.tsx b/packages/connection-form/src/components/connect-form.tsx
@@ -27,11 +27,13 @@ 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,
+  width: spacing[6] * 10 + (csfleFeatureFlag ? 2 : 0),
   position: 'relative',
   display: 'inline-block',
 });
diff --git a/packages/connection-form/src/utils/validation.ts b/packages/connection-form/src/utils/validation.ts
@@ -292,7 +292,7 @@ function validateCSFLEErrors(
       fieldTab: 'csfle',
       fieldName: 'keyVaultNamespace',
       message:
-        'Key Vault namespace must be specified for CSFLE-enabled connections',
+        'Key Vault namespace must be specified for In-Use-Encryption-enabled connections',
     });
   }
   const kmsProviders = autoEncryptionOptions.kmsProviders ?? {};
@@ -363,7 +363,8 @@ function validateCSFLEWarnings(
   const warnings: ConnectionFormWarning[] = [];
   if (connectionOptions.fleOptions?.storeCredentials) {
     warnings.push({
-      message: 'CSFLE KMS provider credentials will be stored to disk.',
+      message:
+        'In-Use Encryption KMS provider credentials will be stored to disk.',
     });
   }
 

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ export const HadronElement: React.FunctionComponent<{`
`486`	`486`	`value.decrypted && (`
`487`	`487`	`<span`
`488`	`488`	`data-test-id="hadron-document-element-decrypted-icon"`
`489`		`- title="Encrypted with CSFLE"`
	`489`	`+ title="Encrypted Field"`
`490`	`490`	`>`
`491`	`491`	`<Icon glyph="Key" size="small" />`
`492`	`492`	`</span>`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ class CellRenderer extends React.Component {`
`207`	`207`	`this.props.value.decrypted && (`
`208`	`208`	`<span`
`209`	`209`	`data-test-id="hadron-document-element-decrypted-icon"`
`210`		`- title="Encrypted with CSFLE"`
	`210`	`+ title="Encrypted Field"`
`211`	`211`	`>`
`212`	`212`	`<Icon glyph="Key" size="small" />`
`213`	`213`	`</span>`