Merge branch 'main' into sharded-state'

Author: paula-stacho

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Sun Sep 29 2024.
+This document was automatically generated on Tue Oct 01 2024.
 
 ## List of dependencies
 

configs/webpack-config-compass/package.json

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"

configs/webpack-config-compass/src/index.ts

@@ -372,3 +372,4 @@ export { sharedExternals, pluginExternals };
 export { webpackArgsWithDefaults, isServe } from './args';
 export { default as webpack } from 'webpack';
 export { merge } from 'webpack-merge';
+export { default as WebpackDevServer } from 'webpack-dev-server';

docs/tracking-plan.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Sun, Sep 29, 2024 at 03:16 AM
+Generated on Tue, Oct 1, 2024 at 07:33 AM
 
 ## Table of Contents
 

package-lock.json

@@ -9,11 +9,6 @@ import {
 import type { Logger } from '@mongodb-js/compass-logging';
 import type { PreferencesAccess } from 'compass-preferences-model';
 import type { AtlasClusterMetadata } from '@mongodb-js/connection-info';
-import type {
-  AutomationAgentRequestTypes,
-  AutomationAgentResponse,
-} from './make-automation-agent-op-request';
-import { makeAutomationAgentOpRequest } from './make-automation-agent-op-request';
 
 export type AtlasServiceOptions = {
   defaultHeaders?: Record<string, string>;
@@ -104,34 +99,90 @@ export class AtlasService {
       },
     });
   }
-  automationAgentFetch<OpType extends keyof AutomationAgentRequestTypes>(
-    atlasMetadata: Pick<
-      AtlasClusterMetadata,
-      | 'projectId'
-      | 'clusterUniqueId'
-      | 'regionalBaseUrl'
-      | 'metricsType'
-      | 'metricsId'
-    >,
-    opType: OpType,
-    opBody: Omit<
-      AutomationAgentRequestTypes[OpType],
-      'clusterId' | 'serverlessId'
-    >
-  ): Promise<AutomationAgentResponse<OpType>> {
+  async automationAgentRequest(
+    atlasMetadata: AtlasClusterMetadata,
+    opType: string,
+    opBody: Record<string, unknown>
+  ): Promise<{ _id: string; requestType: string } | undefined> {
     const opBodyClusterId =
       atlasMetadata.metricsType === 'serverless'
         ? { serverlessId: atlasMetadata.clusterUniqueId }
         : { clusterId: atlasMetadata.metricsId };
-    return makeAutomationAgentOpRequest(
-      this.authenticatedFetch.bind(this),
-      this.regionalizedCloudEndpoint(atlasMetadata),
-      atlasMetadata.projectId,
-      opType,
-      Object.assign(
-        opBodyClusterId,
-        opBody
-      ) as AutomationAgentRequestTypes[OpType]
+    const requestUrl = this.regionalizedCloudEndpoint(
+      atlasMetadata,
+      `/explorer/v1/groups/${atlasMetadata.projectId}/requests/${opType}`
     );
+    const json = await this.authenticatedFetch(requestUrl, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify({ ...opBodyClusterId, ...opBody }),
+    }).then((res) => {
+      if (
+        res.headers
+          .get('content-type')
+          ?.toLowerCase()
+          .includes('application/json')
+      ) {
+        return res.json();
+      }
+    });
+    assertAutomationAgentRequestResponse(json, opType);
+    return json;
+  }
+  async automationAgentAwait<T>(
+    atlasMetadata: AtlasClusterMetadata,
+    opType: string,
+    requestId: string
+  ): Promise<{
+    _id: string;
+    requestType: string;
+    response: T[];
+  }> {
+    const requestUrl = this.regionalizedCloudEndpoint(
+      atlasMetadata,
+      `/explorer/v1/groups/${atlasMetadata.projectId}/requests/${requestId}/types/${opType}/await`
+    );
+    const json = await this.authenticatedFetch(requestUrl, {
+      method: 'GET',
+    }).then((res) => {
+      return res.json();
+    });
+    assertAutomationAgentAwaitResponse<T>(json, opType);
+    return json;
+  }
+}
+
+function assertAutomationAgentRequestResponse(
+  json: any,
+  opType: string
+): asserts json is { _id: string; requestType: string } {
+  if (
+    Object.prototype.hasOwnProperty.call(json, '_id') &&
+    Object.prototype.hasOwnProperty.call(json, 'requestType') &&
+    json.requestType === opType
+  ) {
+    return;
+  }
+  throw new Error(
+    'Got unexpected backend response for automation agent request'
+  );
+}
+
+function assertAutomationAgentAwaitResponse<T>(
+  json: any,
+  opType: string
+): asserts json is { _id: string; requestType: string; response: T[] } {
+  if (
+    Object.prototype.hasOwnProperty.call(json, '_id') &&
+    Object.prototype.hasOwnProperty.call(json, 'requestType') &&
+    Object.prototype.hasOwnProperty.call(json, 'response') &&
+    json.requestType === opType
+  ) {
+    return;
   }
+  throw new Error(
+    'Got unexpected backend response for automation agent request await'
+  );
 }