fix(connections, web): handle flex clusters without deployment

Author: gribnoysup

packages/atlas-service/src/atlas-service.ts

@@ -36,6 +36,21 @@ function shouldAddCSRFHeaders(method = 'get') {
   return !/^(get|head|options|trace)$/.test(method.toLowerCase());
 }
 
+function getAutomationAgentClusterId(
+  atlasMetadata: Pick<
+    AtlasClusterMetadata,
+    'clusterUniqueId' | 'metricsId' | 'metricsType'
+  >
+): { clusterId: string } | { serverlessId: string } | { flexId: string } {
+  if (atlasMetadata.metricsType === 'flex') {
+    return { flexId: atlasMetadata.clusterUniqueId };
+  }
+  if (atlasMetadata.metricsType === 'serverless') {
+    return { serverlessId: atlasMetadata.clusterUniqueId };
+  }
+  return { clusterId: atlasMetadata.metricsId };
+}
+
 export class AtlasService {
   private config: AtlasServiceConfig;
   constructor(
@@ -121,10 +136,7 @@ export class AtlasService {
     opType: string,
     opBody: Record<string, unknown>
   ): Promise<{ _id: string; requestType: string } | undefined> {
-    const opBodyClusterId =
-      atlasMetadata.metricsType === 'serverless'
-        ? { serverlessId: atlasMetadata.clusterUniqueId }
-        : { clusterId: atlasMetadata.metricsId };
+    const opBodyClusterId = getAutomationAgentClusterId(atlasMetadata);
     const requestUrl = this.regionalizedCloudEndpoint(
       atlasMetadata,
       `/explorer/v1/groups/${atlasMetadata.projectId}/requests/${opType}`

packages/compass-connections/src/utils/connection-supports.spec.ts

@@ -145,7 +145,7 @@ const mockConnections = [
       clusterName: 'clusterName',
       regionalBaseUrl: 'https://example.com',
       metricsId: 'metricsId',
-      metricsType: 'replicaSet',
+      metricsType: 'flex',
       instanceSize: 'FLEX',
       clusterType: 'REPLICASET',
       clusterUniqueId: 'clusterUniqueId',

packages/compass-connections/src/utils/connection-supports.ts

@@ -9,14 +9,6 @@ function isFreeOrSharedTierCluster(instanceSize: string | undefined): boolean {
   return ['M0', 'M2', 'M5'].includes(instanceSize);
 }
 
-function isFlexTier(instanceSize: string | undefined): boolean {
-  if (!instanceSize) {
-    return false;
-  }
-
-  return instanceSize === 'FLEX';
-}
-
 function supportsRollingIndexCreation(connectionInfo: ConnectionInfo) {
   const atlasMetadata = connectionInfo.atlasMetadata;
 
@@ -26,9 +18,8 @@ function supportsRollingIndexCreation(connectionInfo: ConnectionInfo) {
 
   const { metricsType, instanceSize } = atlasMetadata;
   return (
-    !isFreeOrSharedTierCluster(instanceSize) &&
-    !isFlexTier(instanceSize) &&
-    (metricsType === 'cluster' || metricsType === 'replicaSet')
+    (metricsType === 'cluster' || metricsType === 'replicaSet') &&
+    !isFreeOrSharedTierCluster(instanceSize)
   );
 }
 

packages/compass-indexes/src/modules/rolling-indexes-service.ts

@@ -67,9 +67,12 @@ export class RollingIndexesService {
 
     // Not possible to do through UI, doing a pre-check here to avoid dealing
     // with payload variations based on metricsType later
-    if (atlasMetadata.metricsType === 'serverless') {
+    if (
+      atlasMetadata.metricsType === 'serverless' ||
+      atlasMetadata.metricsType === 'flex'
+    ) {
       throw new Error(
-        "Serverless clusters don't support rolling index build creation"
+        'Flex clusters don not support rolling index build creation'
       );
     }
 

packages/compass-schema/src/utils.ts

@@ -13,12 +13,13 @@ export function getAtlasPerformanceAdvisorLink({
   metricsType,
   clusterName,
 }: Pick<AtlasClusterMetadata, 'metricsId' | 'metricsType' | 'clusterName'>) {
-  if (metricsType === 'serverless') {
-    return `#/serverless/advisor/${encodeURIComponent(
-      clusterName
-    )}/createIndexes`;
+  const name = encodeURIComponent(clusterName);
+  const type = encodeURIComponent(metricsType);
+  const id = encodeURIComponent(metricsId);
+
+  if (metricsType === 'serverless' || metricsType === 'flex') {
+    return `#/${type}/advisor/${name}/createIndexes`;
   }
-  return `#/metrics/${encodeURIComponent(metricsType)}/${encodeURIComponent(
-    metricsId
-  )}/advisor`;
+
+  return `#/metrics/${type}/${id}/advisor`;
 }

packages/compass-web/src/connection-storage.tsx

@@ -2,6 +2,7 @@ import React, { useContext, useRef } from 'react';
 import type {
   ConnectionStorage,
   ConnectionInfo,
+  AtlasClusterMetadata,
 } from '@mongodb-js/connection-storage/provider';
 import {
   ConnectionStorageProvider,
@@ -90,6 +91,10 @@ function isServerless(clusterDescription: ClusterDescription) {
   return clusterDescription['@provider'] === 'SERVERLESS';
 }
 
+function isFlex(clusterDescription: ClusterDescription) {
+  return clusterDescription['@provider'] === 'FLEX';
+}
+
 function isSharded(clusterDescription: ClusterDescription) {
   return (
     clusterDescription.clusterType === 'SHARDED' ||
@@ -100,14 +105,15 @@ function isSharded(clusterDescription: ClusterDescription) {
 function getMetricsIdAndType(
   clusterDescription: ClusterDescription,
   deploymentItem?: ReplicaSetDeploymentItem | ShardingDeploymentItem
-): {
-  metricsId: string;
-  metricsType: 'serverless' | 'replicaSet' | 'cluster';
-} {
+): Pick<AtlasClusterMetadata, 'metricsId' | 'metricsType'> {
   if (isServerless(clusterDescription)) {
     return { metricsId: clusterDescription.name, metricsType: 'serverless' };
   }
 
+  if (isFlex(clusterDescription)) {
+    return { metricsId: clusterDescription.name, metricsType: 'flex' };
+  }
+
   if (!deploymentItem) {
     throw new Error(
       "Can't build metrics info when deployment item is not found"

packages/compass-web/webpack.config.js

@@ -148,7 +148,7 @@ module.exports = (env, args) => {
       }),
     ],
     performance: {
-      hints: serve ? 'warning' : 'error',
+      hints: serve || args.watch ? 'warning' : 'error',
       maxEntrypointSize: MAX_COMPRESSION_FILE_SIZE,
       maxAssetSize: MAX_COMPRESSION_FILE_SIZE,
     },

packages/connection-info/src/connection-info.ts

@@ -36,8 +36,10 @@ export interface AtlasClusterMetadata {
    *   - `replicaSet`: anything that is not sharded (both dedicated or "free
    *                   tier" / MTM)
    *   - `serverless`: specifically for serverless clusters
+   *   - `flex`:       new type that replaces serverless and some shared
+   *                   clusters
    */
-  metricsType: 'host' | 'replicaSet' | 'cluster' | 'serverless';
+  metricsType: 'host' | 'replicaSet' | 'cluster' | 'serverless' | 'flex';
   /**
    * Atlas API base url to be used when making control plane requests for a
    * regionalized cluster