chore(compass-web): use ccs for atlas sandbox instead of local proxy

mongodb-js · Dec 16, 2024 · bc5fd2c · bc5fd2c
1 parent 8945d7d
commit bc5fd2c
Show file tree

Hide file tree

Showing 8 changed files with 182 additions and 229 deletions.
diff --git a/packages/atlas-service/src/util.ts b/packages/atlas-service/src/util.ts
@@ -122,9 +122,11 @@ export type AtlasServiceConfig = {
  * Atlas service backend configurations.
  *  - atlas-local:             local mms backend         (localhost)
  *  - atlas-dev:               dev mms backend           (cloud-dev.mongodb.com)
+ *  - atlas-qa:                qa mms backend            (cloud-qa.mongodb.com)
  *  - atlas:                   mms backend               (cloud.mongodb.com)
  *  - web-sandbox-atlas-local: local mms backend + proxy (localhost / proxy prefix)
  *  - web-sandbox-atlas-dev:   dev mms backend + proxy   (cloud-dev.mongodb.com / proxy prefix)
+ *  - web-sandbox-atlas-qa:    qa mms backend + proxy    (cloud-qa.mongodb.com / proxy prefix)
  *  - web-sandbox-atlas:       mms backend + proxy       (cloud.mongodb.com / proxy prefix)
  */
 const config = {
@@ -148,6 +150,16 @@ const config = {
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
   },
+  'atlas-qa': {
+    wsBaseUrl: '',
+    cloudBaseUrl: '',
+    atlasApiBaseUrl: 'https://cloud-qa.mongodb.com/api/private',
+    atlasLogin: {
+      clientId: '0oaq1le5jlzxCuTbu357',
+      issuer: 'https://auth-qa.mongodb.com/oauth2/default',
+    },
+    authPortalUrl: 'https://account-qa.mongodb.com/account/login',
+  },
   atlas: {
     wsBaseUrl: '',
     cloudBaseUrl: '',
@@ -159,7 +171,7 @@ const config = {
     authPortalUrl: 'https://account.mongodb.com/account/login',
   },
   'web-sandbox-atlas-local': {
-    wsBaseUrl: 'ws://localhost:1337',
+    wsBaseUrl: '/ccs',
     cloudBaseUrl: '/cloud-mongodb-com',
     atlasApiBaseUrl: 'http://localhost:8080/api/private',
     atlasLogin: {
@@ -169,7 +181,17 @@ const config = {
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
   },
   'web-sandbox-atlas-dev': {
-    wsBaseUrl: 'ws://localhost:1337',
+    wsBaseUrl: '/ccs',
+    cloudBaseUrl: '/cloud-mongodb-com',
+    atlasApiBaseUrl: 'https://cloud-dev.mongodb.com/api/private',
+    atlasLogin: {
+      clientId: '0oaq1le5jlzxCuTbu357',
+      issuer: 'https://auth-qa.mongodb.com/oauth2/default',
+    },
+    authPortalUrl: 'https://account-dev.mongodb.com/account/login',
+  },
+  'web-sandbox-atlas-qa': {
+    wsBaseUrl: '/ccs',
     cloudBaseUrl: '/cloud-mongodb-com',
     atlasApiBaseUrl: 'https://cloud-dev.mongodb.com/api/private',
     atlasLogin: {
@@ -179,7 +201,7 @@ const config = {
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
   },
   'web-sandbox-atlas': {
-    wsBaseUrl: 'ws://localhost:1337',
+    wsBaseUrl: '/ccs',
     cloudBaseUrl: '/cloud-mongodb-com',
     atlasApiBaseUrl: 'https://cloud.mongodb.com/api/private',
     atlasLogin: {

diff --git a/packages/compass-e2e-tests/helpers/compass-web-sandbox.ts b/packages/compass-e2e-tests/helpers/compass-web-sandbox.ts
@@ -182,10 +182,6 @@ export async function spawnCompassWebSandboxAndSignInToAtlas(
     return electronProxyRemote;
   }
 
-  debug('Waiting for x509 cert to propagate to Atlas clusters ...');
-
-  await fetch(`${sandboxUrl}/x509`);
-
   return electronProxyRemote;
 }
 

diff --git a/packages/compass-preferences-model/src/preferences-schema.ts b/packages/compass-preferences-model/src/preferences-schema.ts
@@ -52,9 +52,11 @@ export type UserConfigurablePreferences = PermanentFeatureFlags &
     atlasServiceBackendPreset:
       | 'atlas-local'
       | 'atlas-dev'
+      | 'atlas-qa'
       | 'atlas'
       | 'web-sandbox-atlas-local'
       | 'web-sandbox-atlas-dev'
+      | 'web-sandbox-atlas-qa'
       | 'web-sandbox-atlas';
     optInDataExplorerGenAIFeatures: boolean;
     // Features that are enabled by default in Compass, but are disabled in Data
@@ -672,6 +674,7 @@ export const storedUserPreferencesProps: Required<{
    * Chooses atlas service backend configuration from preset
    *  - atlas-local: local mms backend (http://localhost:8080)
    *  - atlas-dev:   dev mms backend (cloud-dev.mongodb.com)
+   *  - atlas-qa:    qa mms backend (cloud-qa.mongodb.com)
    *  - atlas:       mms backend (cloud.mongodb.com)
    */
   atlasServiceBackendPreset: {
@@ -683,11 +686,13 @@ export const storedUserPreferencesProps: Required<{
     },
     validator: z
       .enum([
-        'atlas-dev',
         'atlas-local',
+        'atlas-dev',
+        'atlas-qa',
         'atlas',
-        'web-sandbox-atlas-dev',
         'web-sandbox-atlas-local',
+        'web-sandbox-atlas-dev',
+        'web-sandbox-atlas-qa',
         'web-sandbox-atlas',
       ])
       .default('atlas'),

diff --git a/packages/compass-web/polyfills/net/index.ts b/packages/compass-web/polyfills/net/index.ts
@@ -2,16 +2,13 @@ import { ipVersion } from 'is-ip';
 import type { ConnectionOptions } from 'mongodb-data-service';
 import { Duplex } from 'stream';
 
-const WS_PROXY_PORT = process.env.COMPASS_WEB_WS_PROXY_PORT
-  ? Number(process.env.COMPASS_WEB_WS_PROXY_PORT)
-  : 1337;
-
 /**
  * net.Socket interface that works over the WebSocket connection. For now, only
  * used when running compass-web in a local sandbox, mms has their own
  * implementation
  */
 class Socket extends Duplex {
+  private _tls = false;
   private _ws: WebSocket | null = null;
   private _setOptions: {
     setKeepAlive?: { enabled?: boolean; initialDelay?: number };
@@ -30,17 +27,20 @@ class Socket extends Duplex {
     lookup?: ConnectionOptions['lookup'];
     tls?: boolean;
   }) {
-    const { wsURL, ...atlasOptions } = lookup?.() ?? {};
-    this._ws = new WebSocket(wsURL ?? `ws://localhost:${WS_PROXY_PORT}`);
+    this._tls = !!options.tls;
+    const { wsURL, ...atlasOptions } =
+      lookup?.() ?? ({} as { wsURL?: string; clusterName?: string });
+    this._ws = new WebSocket(wsURL ?? '/ws-proxy');
     this._ws.binaryType = 'arraybuffer';
     this._ws.addEventListener(
       'open',
       () => {
         const connectMsg = JSON.stringify({
-          connectOptions: options,
-          atlasOptions:
-            Object.keys(atlasOptions).length > 0 ? atlasOptions : undefined,
-          setOptions: this._setOptions,
+          port: options.port,
+          host: options.host,
+          tls: options.tls ?? false,
+          clusterName: atlasOptions.clusterName,
+          ok: 1,
         });
         setTimeout(() => {
           this._ws?.send(connectMsg);
@@ -59,16 +59,12 @@ class Socket extends Duplex {
       ({ data }: MessageEvent<string | ArrayBuffer>) => {
         if (typeof data === 'string') {
           try {
-            const { evt, error } = JSON.parse(data) as {
-              evt: string;
-              error?: Error;
-            };
-            setTimeout(() => {
-              this.emit(
-                evt,
-                evt === 'error' ? Object.assign(new Error(), error) : undefined
-              );
-            });
+            const res = JSON.parse(data) as { preMessageOk: 1 };
+            if (res.preMessageOk) {
+              setTimeout(() => {
+                this.emit(this._tls ? 'secureConnect' : 'connect');
+              });
+            }
           } catch (err) {
             // eslint-disable-next-line no-console
             console.error('error parsing proxy message "%s":', data, err);

diff --git a/packages/compass-web/sandbox/index.tsx b/packages/compass-web/sandbox/index.tsx
@@ -36,9 +36,10 @@ const App = () => {
   const atlasServiceSandboxBackendVariant =
     process.env.COMPASS_WEB_HTTP_PROXY_CLOUD_CONFIG === 'local'
       ? 'web-sandbox-atlas-local'
-      : process.env.COMPASS_WEB_HTTP_PROXY_CLOUD_CONFIG === 'dev' ||
-        process.env.COMPASS_WEB_HTTP_PROXY_CLOUD_CONFIG === 'qa'
+      : process.env.COMPASS_WEB_HTTP_PROXY_CLOUD_CONFIG === 'dev'
       ? 'web-sandbox-atlas-dev'
+      : process.env.COMPASS_WEB_HTTP_PROXY_CLOUD_CONFIG === 'qa'
+      ? 'web-sandbox-atlas-qa'
       : 'web-sandbox-atlas';
 
   const overrideGenAIEnablement =