chore: remove proxy config for mongo with no sharding

percona · Oct 11, 2024 · c0a4432 · c0a4432
1 parent 95c8f03
commit c0a4432
Show file tree

Hide file tree

Showing 14 changed files with 154 additions and 91 deletions.
diff --git a/ui/apps/everest/src/components/cluster-form/resources/constants.ts b/ui/apps/everest/src/components/cluster-form/resources/constants.ts
@@ -162,6 +162,25 @@ export const getDefaultNumberOfconfigServersByNumberOfNodes = (
   } else return '7';
 };
 
+const numberOfResourcesValidator = (
+  numberOfResourcesStr: string,
+  customNrOfResoucesStr: string,
+  fieldPath: string,
+  ctx: z.RefinementCtx
+) => {
+  if (numberOfResourcesStr === CUSTOM_NR_UNITS_INPUT_VALUE) {
+    const intNr = parseInt(customNrOfResoucesStr, 10);
+
+    if (Number.isNaN(intNr) || intNr < 1) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Please enter a valid number',
+        path: [fieldPath],
+      });
+    }
+  }
+};
+
 export const resourcesFormSchema = (passthrough?: boolean) => {
   const objectShape = {
     [DbWizardFormFields.shardNr]: z.string().optional(),
@@ -199,26 +218,21 @@ export const resourcesFormSchema = (passthrough?: boolean) => {
       },
       ctx
     ) => {
-      [
-        [numberOfNodes, customNrOfNodes, DbWizardFormFields.customNrOfNodes],
-        [
+      numberOfResourcesValidator(
+        numberOfNodes,
+        customNrOfNodes,
+        DbWizardFormFields.customNrOfNodes,
+        ctx
+      );
+
+      if (dbType !== DbType.Mongo || (dbType === DbType.Mongo && !!sharding)) {
+        numberOfResourcesValidator(
           numberOfProxies,
-          customNrOfProxies,
+          customNrOfNodes,
           DbWizardFormFields.customNrOfProxies,
-        ],
-      ].forEach(([nr, customNr, path]) => {
-        if (nr === CUSTOM_NR_UNITS_INPUT_VALUE) {
-          const intNr = parseInt(customNr, 10);
-
-          if (Number.isNaN(intNr) || intNr < 1) {
-            ctx.addIssue({
-              code: z.ZodIssueCode.custom,
-              message: 'Please enter a valid number',
-              path: [path],
-            });
-          }
-        }
-      });
+          ctx
+        );
+      }
 
       if (
         numberOfNodes === CUSTOM_NR_UNITS_INPUT_VALUE &&

diff --git a/ui/apps/everest/src/components/cluster-form/resources/resources.tsx b/ui/apps/everest/src/components/cluster-form/resources/resources.tsx
@@ -423,8 +423,10 @@ const ResourcesForm = ({
   allowDiskInputUpdate,
   pairProxiesWithNodes,
   showSharding,
+  showProxies,
 }: {
   dbType: DbType;
+  showProxies: boolean;
   disableDiskInput?: boolean;
   allowDiskInputUpdate?: boolean;
   pairProxiesWithNodes?: boolean;
@@ -559,37 +561,41 @@ const ResourcesForm = ({
           disableCustom={dbType === DbType.Mysql}
         />
       </Accordion>
-      <Accordion
-        expanded={expanded === 'proxies'}
-        data-testid="proxies-accordion"
-        onChange={handleAccordionChange('proxies')}
-        sx={{
-          px: 2,
-        }}
-      >
-        <CustomAccordionSummary
-          unitPlural={proxyUnitNames.plural}
-          nr={parseInt(proxiesAccordionSummaryNumber, 10)}
-        />
-        <Divider />
-        <ResourcesToggles
-          dbType={dbType}
-          unit={proxyUnitNames.singular}
-          unitPlural={proxyUnitNames.plural}
-          options={NODES_DB_TYPE_MAP[dbType]}
-          sizeOptions={PROXIES_DEFAULT_SIZES[dbType]}
-          resourceSizePerUnitInputName={DbWizardFormFields.resourceSizePerProxy}
-          cpuInputName={DbWizardFormFields.proxyCpu}
-          memoryInputName={DbWizardFormFields.proxyMemory}
-          numberOfUnitsInputName={DbWizardFormFields.numberOfProxies}
-          customNrOfUnitsInputName={DbWizardFormFields.customNrOfProxies}
-        />
-        {proxyFieldError && (
-          <FormHelperText error={true}>
-            {proxyFieldError?.message}
-          </FormHelperText>
-        )}
-      </Accordion>
+      {!!showProxies && (
+        <Accordion
+          expanded={expanded === 'proxies'}
+          data-testid="proxies-accordion"
+          onChange={handleAccordionChange('proxies')}
+          sx={{
+            px: 2,
+          }}
+        >
+          <CustomAccordionSummary
+            unitPlural={proxyUnitNames.plural}
+            nr={parseInt(proxiesAccordionSummaryNumber, 10)}
+          />
+          <Divider />
+          <ResourcesToggles
+            dbType={dbType}
+            unit={proxyUnitNames.singular}
+            unitPlural={proxyUnitNames.plural}
+            options={NODES_DB_TYPE_MAP[dbType]}
+            sizeOptions={PROXIES_DEFAULT_SIZES[dbType]}
+            resourceSizePerUnitInputName={
+              DbWizardFormFields.resourceSizePerProxy
+            }
+            cpuInputName={DbWizardFormFields.proxyCpu}
+            memoryInputName={DbWizardFormFields.proxyMemory}
+            numberOfUnitsInputName={DbWizardFormFields.numberOfProxies}
+            customNrOfUnitsInputName={DbWizardFormFields.customNrOfProxies}
+          />
+          {proxyFieldError && (
+            <FormHelperText error={true}>
+              {proxyFieldError?.message}
+            </FormHelperText>
+          )}
+        </Accordion>
+      )}
       {!!showSharding && !!sharding && (
         <CustomPaper sx={{ mt: 2 }}>
           <Typography variant="sectionHeading">

diff --git a/ui/apps/everest/src/hooks/api/db-cluster/useCreateDbCluster.ts b/ui/apps/everest/src/hooks/api/db-cluster/useCreateDbCluster.ts
@@ -111,6 +111,7 @@ const formValuesToPayloadMapping = (
         dbPayload.externalAccess,
         dbPayload.proxyCpu,
         dbPayload.proxyMemory,
+        dbPayload.sharding,
         dbPayload.sourceRanges || []
       ),
       ...(dbPayload.dbType === DbType.Mongo && {

diff --git a/ui/apps/everest/src/hooks/api/db-cluster/useUpdateDbCluster.ts b/ui/apps/everest/src/hooks/api/db-cluster/useUpdateDbCluster.ts
@@ -15,12 +15,13 @@
 
 import { UseMutationOptions, useMutation } from '@tanstack/react-query';
 import { updateDbClusterFn } from 'api/dbClusterApi';
-import { DbCluster } from 'shared-types/dbCluster.types';
+import { DbCluster, Proxy } from 'shared-types/dbCluster.types';
 import { DbWizardType } from 'pages/database-form/database-form-schema.ts';
 import cronConverter from 'utils/cron-converter';
 import { CUSTOM_NR_UNITS_INPUT_VALUE } from 'components/cluster-form';
 import { getProxySpec } from './utils';
 import { DbType } from '@percona/types';
+import { DbEngineType } from 'shared-types/dbEngines.types';
 
 type UpdateDbClusterArgType = {
   dbPayload: DbWizardType;
@@ -95,31 +96,35 @@ const formValuesToPayloadOverrides = (
           monitoringConfigName: dbPayload?.monitoringInstance!,
         }),
       },
-      proxy: {
-        ...dbCluster.spec.proxy,
-        ...getProxySpec(
-          dbPayload.dbType,
-          dbPayload.numberOfProxies,
-          dbPayload.customNrOfProxies || '',
-          dbPayload.externalAccess,
-          dbPayload.proxyCpu,
-          dbPayload.proxyMemory,
-          dbPayload.sourceRanges || []
-        ),
-        // replicas: numberOfNodes,
-        // expose: {
-        //   ...dbCluster.spec.proxy.expose,
-        //   type: dbPayload.externalAccess
-        //     ? ProxyExposeType.external
-        //     : ProxyExposeType.internal,
-        //   ...(!!dbPayload.externalAccess &&
-        //     dbPayload.sourceRanges && {
-        //       ipSourceRanges: dbPayload.sourceRanges.flatMap((source) =>
-        //         source.sourceRange ? [source.sourceRange] : []
-        //       ),
-        //     }),
-        // },
-      },
+      proxy:
+        dbPayload.dbType === DbType.Mongo && !dbPayload.sharding
+          ? {}
+          : {
+              ...dbCluster.spec.proxy,
+              ...getProxySpec(
+                dbPayload.dbType,
+                dbPayload.numberOfProxies,
+                dbPayload.customNrOfProxies || '',
+                dbPayload.externalAccess,
+                dbPayload.proxyCpu,
+                dbPayload.proxyMemory,
+                dbPayload.sharding,
+                dbPayload.sourceRanges || []
+              ),
+              // replicas: numberOfNodes,
+              // expose: {
+              //   ...dbCluster.spec.proxy.expose,
+              //   type: dbPayload.externalAccess
+              //     ? ProxyExposeType.external
+              //     : ProxyExposeType.internal,
+              //   ...(!!dbPayload.externalAccess &&
+              //     dbPayload.sourceRanges && {
+              //       ipSourceRanges: dbPayload.sourceRanges.flatMap((source) =>
+              //         source.sourceRange ? [source.sourceRange] : []
+              //       ),
+              //     }),
+              // },
+            },
       ...(dbPayload.dbType === DbType.Mongo && {
         sharding: {
           enabled: dbPayload.sharding,
@@ -235,6 +240,7 @@ export const useUpdateDbClusterResources = () =>
     mutationFn: ({
       dbCluster,
       newResources,
+      sharding,
     }: {
       dbCluster: DbCluster;
       newResources: {
@@ -247,6 +253,7 @@ export const useUpdateDbClusterResources = () =>
         proxyMemory: number;
         numberOfProxies: number;
       };
+      sharding: boolean;
     }) =>
       updateDbClusterFn(dbCluster.metadata.name, dbCluster.metadata.namespace, {
         ...dbCluster,
@@ -264,14 +271,17 @@ export const useUpdateDbClusterResources = () =>
               size: `${newResources.disk}${newResources.diskUnit}`,
             },
           },
-          proxy: {
-            ...dbCluster.spec.proxy,
-            replicas: newResources.numberOfProxies,
-            resources: {
-              cpu: `${newResources.proxyCpu}`,
-              memory: `${newResources.proxyMemory}G`,
-            },
-          },
+          proxy:
+            dbCluster.spec.engine.type === DbEngineType.PSMDB && !sharding
+              ? {}
+              : ({
+                  ...dbCluster.spec.proxy,
+                  replicas: newResources.numberOfProxies,
+                  resources: {
+                    cpu: `${newResources.proxyCpu}`,
+                    memory: `${newResources.proxyMemory}G`,
+                  },
+                } as Proxy),
         },
       }),
   });

diff --git a/ui/apps/everest/src/hooks/api/db-cluster/utils.ts b/ui/apps/everest/src/hooks/api/db-cluster/utils.ts
@@ -10,14 +10,24 @@ export const getProxySpec = (
   externalAccess: boolean,
   cpu: number,
   memory: number,
+  sharding: boolean,
   sourceRanges?: Array<{ sourceRange?: string }>
-): Proxy => {
+): Proxy | Record<string, never> => {
+  console.log('dbType', dbType);
+  console.log('sharding', sharding);
+  if (dbType === DbType.Mongo && !sharding) {
+    console.log('returning empty object');
+    return {};
+  }
   const proxyNr = parseInt(
     numberOfProxies === CUSTOM_NR_UNITS_INPUT_VALUE
       ? customNrOfProxies
       : numberOfProxies,
     10
   );
+  // const showResources =
+  //   dbType !== DbType.Mongo || (dbType === DbType.Mongo && !sharding);
+
   return {
     type: dbTypeToProxyType(dbType),
     replicas: proxyNr,

diff --git a/...pps/everest/src/pages/database-form/database-form-body/steps/resources/resources-step.tsx b/...pps/everest/src/pages/database-form/database-form-body/steps/resources/resources-step.tsx
@@ -23,6 +23,7 @@ export const ResourcesStep = () => {
         disableDiskInput={mode === 'edit'}
         allowDiskInputUpdate={mode !== 'edit'}
         showSharding={dbType === DbType.Mongo}
+        showProxies={dbType !== DbType.Mongo}
       />
     </>
   );

diff --git a/ui/apps/everest/src/pages/database-form/database-form.utils.ts b/ui/apps/everest/src/pages/database-form/database-form.utils.ts
@@ -49,7 +49,7 @@ export const DbClusterPayloadToFormValues = (
 ): DbWizardType => {
   const backup = dbCluster?.spec?.backup;
   const replicas = dbCluster?.spec?.engine?.replicas.toString();
-  const proxies = dbCluster?.spec?.proxy?.replicas.toString();
+  const proxies = (dbCluster?.spec?.proxy?.replicas || 0).toString();
   const diskValues = memoryParser(
     dbCluster?.spec?.engine?.storage?.size.toString()
   );

diff --git a/ui/apps/everest/src/pages/databases/DbClusterView.utils.ts b/ui/apps/everest/src/pages/databases/DbClusterView.utils.ts
@@ -18,6 +18,7 @@ import { DbClusterForNamespaceResult } from '../../hooks/api/db-clusters/useDbCl
 import { Messages } from './dbClusterView.messages';
 import { DbClusterTableElement } from './dbClusterView.types';
 import { Backup, BackupStatus } from 'shared-types/backups.types';
+import { isProxy } from 'utils/db';
 
 const DB_CLUSTER_STATUS_HUMANIFIED: Record<DbClusterStatus, string> = {
   [DbClusterStatus.ready]: Messages.statusProvider.up,
@@ -55,7 +56,9 @@ export const convertDbClusterPayloadToTableFormat = (
           storage: cluster.spec.engine.storage.size,
           nodes: cluster.spec.engine.replicas,
           hostName: cluster.status ? cluster.status.hostname : '',
-          exposetype: cluster.spec.proxy.expose.type,
+          exposetype: isProxy(cluster.spec.proxy)
+            ? cluster.spec.proxy.expose.type
+            : undefined,
           port: cluster.status?.port,
           monitoringConfigName:
             cluster.spec.monitoring?.monitoringConfigName ?? '',

diff --git a/ui/apps/everest/src/pages/databases/dbClusterView.types.ts b/ui/apps/everest/src/pages/databases/dbClusterView.types.ts
@@ -38,7 +38,7 @@ export interface DbClusterTableElement {
   nodes: number;
   hostName: string;
   port?: number;
-  exposetype: ProxyExposeType;
+  exposetype?: ProxyExposeType;
   monitoringConfigName?: string;
   raw: DbCluster;
 }
diff --git a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/resources-details.tsx b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/resources-details.tsx
@@ -39,6 +39,7 @@ import {
 import { dbEngineToDbType } from '@percona/utils';
 import { DB_CLUSTER_QUERY, useUpdateDbClusterResources } from 'hooks';
 import { DbType } from '@percona/types';
+import { isProxy } from 'utils/db';
 
 export const ResourcesDetails = ({
   dbCluster,
@@ -58,7 +59,9 @@ export const ResourcesDetails = ({
   const parsedMemoryValues = memoryParser(memory.toString());
   const dbType = dbEngineToDbType(dbCluster.spec.engine.type);
   const replicas = dbCluster.spec.engine.replicas.toString();
-  const proxies = dbCluster.spec.proxy.replicas.toString();
+  const proxies = isProxy(dbCluster.spec.proxy)
+    ? (dbCluster.spec.proxy.replicas || 0).toString()
+    : '';
   const numberOfNodes = NODES_DB_TYPE_MAP[dbType].includes(replicas)
     ? replicas
     : CUSTOM_NR_UNITS_INPUT_VALUE;
@@ -103,6 +106,7 @@ export const ResourcesDetails = ({
             10
           ),
         },
+        sharding: !!sharding?.enabled,
       },
       {
         onSuccess: () => {
@@ -213,7 +217,9 @@ export const ResourcesDetails = ({
             ),
             resourceSizePerProxy: matchFieldsValueToResourceSize(
               dbType,
-              dbCluster.spec.proxy.resources
+              isProxy(dbCluster.spec.proxy)
+                ? dbCluster.spec.proxy.resources
+                : undefined
             ),
           }}
         />

diff --git a/...st/src/pages/db-cluster-details/cluster-overview/cards/resources/resources-edit-modal.tsx b/...st/src/pages/db-cluster-details/cluster-overview/cards/resources/resources-edit-modal.tsx
@@ -33,6 +33,7 @@ const ResourcesEditModal = ({
         showSharding={false}
         disableDiskInput
         allowDiskInputUpdate={false}
+        showProxies={dbType !== DbType.Mongo}
       />
     </FormDialog>
   );