feat(pci-databases-analytics): update typings for databases api

ref: DATATR-1866 Signed-off-by: Jonathan Perchoc <[email protected]>
ovh · Jan 10, 2025 · 52ae7cf · 52ae7cf
1 parent ee91b4b
commit 52ae7cf
Show file tree

Hide file tree

Showing 102 changed files with 620 additions and 419 deletions.
diff --git a/.../pci-databases-analytics/src/__tests__/helpers/mocks/availabilitiesMock/availabilities.ts b/.../pci-databases-analytics/src/__tests__/helpers/mocks/availabilitiesMock/availabilities.ts
@@ -29,6 +29,17 @@ const mongo: database.Availability[] = [
     lifecycle: mockedLifecycle,
     region: 'GRA',
     default: false,
+    backup: database.BackupTypeEnum.automatic,
+    backupRetentionDays: 0,
+    flavor: '',
+    maxDiskSize: 0,
+    maxNodeNumber: 0,
+    minDiskSize: 0,
+    minNodeNumber: 0,
+    network: database.NetworkTypeEnum.public,
+    startDate: '',
+    status: database.availability.StatusEnum.STABLE,
+    stepDiskSize: 0,
   },
   {
     engine: 'mongodb',
@@ -55,6 +66,17 @@ const mongo: database.Availability[] = [
     lifecycle: mockedLifecycle,
     region: 'GRA',
     default: false,
+    backup: database.BackupTypeEnum.automatic,
+    backupRetentionDays: 0,
+    flavor: '',
+    maxDiskSize: 0,
+    maxNodeNumber: 0,
+    minDiskSize: 0,
+    minNodeNumber: 0,
+    network: database.NetworkTypeEnum.public,
+    startDate: '',
+    status: database.availability.StatusEnum.STABLE,
+    stepDiskSize: 0,
   },
   {
     engine: 'mongodb',
@@ -81,6 +103,17 @@ const mongo: database.Availability[] = [
     lifecycle: mockedLifecycle,
     region: 'GRA',
     default: false,
+    backup: database.BackupTypeEnum.automatic,
+    backupRetentionDays: 0,
+    flavor: '',
+    maxDiskSize: 0,
+    maxNodeNumber: 0,
+    minDiskSize: 0,
+    minNodeNumber: 0,
+    network: database.NetworkTypeEnum.public,
+    startDate: '',
+    status: database.availability.StatusEnum.STABLE,
+    stepDiskSize: 0,
   },
   {
     engine: 'mongodb',
@@ -107,6 +140,17 @@ const mongo: database.Availability[] = [
     lifecycle: mockedLifecycle,
     region: 'GRA',
     default: false,
+    backup: database.BackupTypeEnum.automatic,
+    backupRetentionDays: 0,
+    flavor: '',
+    maxDiskSize: 0,
+    maxNodeNumber: 0,
+    minDiskSize: 0,
+    minNodeNumber: 0,
+    network: database.NetworkTypeEnum.public,
+    startDate: '',
+    status: database.availability.StatusEnum.STABLE,
+    stepDiskSize: 0,
   },
 ];
 
@@ -136,6 +180,17 @@ const pg: database.Availability[] = [
     lifecycle: mockedLifecycle,
     region: 'GRA',
     default: false,
+    backup: database.BackupTypeEnum.automatic,
+    backupRetentionDays: 0,
+    flavor: '',
+    maxDiskSize: 0,
+    maxNodeNumber: 0,
+    minDiskSize: 0,
+    minNodeNumber: 0,
+    network: database.NetworkTypeEnum.public,
+    startDate: '',
+    status: database.availability.StatusEnum.STABLE,
+    stepDiskSize: 0,
   },
   {
     engine: 'postgresql',
@@ -162,6 +217,17 @@ const pg: database.Availability[] = [
     lifecycle: mockedLifecycle,
     region: 'GRA',
     default: false,
+    backup: database.BackupTypeEnum.automatic,
+    backupRetentionDays: 0,
+    flavor: '',
+    maxDiskSize: 0,
+    maxNodeNumber: 0,
+    minDiskSize: 0,
+    minNodeNumber: 0,
+    network: database.NetworkTypeEnum.public,
+    startDate: '',
+    status: database.availability.StatusEnum.STABLE,
+    stepDiskSize: 0,
   },
 ];
 
@@ -186,6 +252,17 @@ const grafana = [
     lifecycle: mockedLifecycle,
     region: 'GRA',
     default: false,
+    backup: database.BackupTypeEnum.automatic,
+    backupRetentionDays: 0,
+    flavor: '',
+    maxDiskSize: 0,
+    maxNodeNumber: 0,
+    minDiskSize: 0,
+    minNodeNumber: 0,
+    network: database.NetworkTypeEnum.public,
+    startDate: '',
+    status: database.availability.StatusEnum.STABLE,
+    stepDiskSize: 0,
   },
 ];
 

diff --git a/...ps/pci-databases-analytics/src/__tests__/helpers/mocks/availabilitiesMock/capabilities.ts b/...ps/pci-databases-analytics/src/__tests__/helpers/mocks/availabilitiesMock/capabilities.ts
@@ -59,6 +59,9 @@ export const mockedCapabilities: FullCapabilities = {
         memory: { value: 0, unit: 'GB' },
         storage: { value: 512, unit: 'MB' },
       },
+      core: 0,
+      memory: 0,
+      storage: 0,
     },
     {
       name: 'db1',
@@ -70,6 +73,9 @@ export const mockedCapabilities: FullCapabilities = {
         memory: { value: 16, unit: 'GB' },
         storage: { value: 20, unit: 'GB' },
       },
+      core: 0,
+      memory: 0,
+      storage: 0,
     },
     {
       name: 'db2',
@@ -81,6 +87,9 @@ export const mockedCapabilities: FullCapabilities = {
         memory: { value: 32, unit: 'GB' },
         storage: { value: 40, unit: 'GB' },
       },
+      core: 0,
+      memory: 0,
+      storage: 0,
     },
     {
       name: 'db3',
@@ -92,6 +101,9 @@ export const mockedCapabilities: FullCapabilities = {
         memory: { value: 64, unit: 'GB' },
         storage: { value: 40, unit: 'GB' },
       },
+      core: 0,
+      memory: 0,
+      storage: 0,
     },
   ],
   options: [

diff --git a/packages/manager/apps/pci-databases-analytics/src/__tests__/helpers/mocks/services.ts b/packages/manager/apps/pci-databases-analytics/src/__tests__/helpers/mocks/services.ts
@@ -75,7 +75,6 @@ export const mockedService: database.Service = {
   nodeNumber: 2,
   nodes: [mockedNode],
   plan: 'plan',
-  region: 'region',
   status: database.StatusEnum.CREATING,
   storage: {
     size: {
@@ -161,7 +160,6 @@ export const mockedServiceInte: database.Service = {
   nodeNumber: 2,
   nodes: [mockedNode],
   plan: 'plan',
-  region: 'region',
   status: database.StatusEnum.CREATING,
   storage: {
     size: {
@@ -193,6 +191,7 @@ export const mockedServiceCreation: database.ServiceCreation = {
   plan: 'plan',
   subnetId: 'subnetId',
   version: 'version',
+  disk: undefined,
 };
 
 export const mockedServiceCreationWithEngine: ServiceCreationWithEngine = {
@@ -247,7 +246,6 @@ export const mockedServiceInteBase: database.Service = {
   nodeNumber: 2,
   nodes: [mockedNode],
   plan: 'plan',
-  region: 'region',
   status: database.StatusEnum.READY,
   storage: {
     size: {

diff --git a/packages/manager/apps/pci-databases-analytics/src/data/api/database/namespace.api.ts b/packages/manager/apps/pci-databases-analytics/src/data/api/database/namespace.api.ts
@@ -39,8 +39,8 @@ export const addNamespace = async ({
 
 export type NamespaceEdition = Omit<
   database.m3db.NamespaceCreation,
-  'name' | 'type'
->;
+  'name' | 'type' | 'resolution'
+> & { resolution?: string };
 export interface EditNamespace extends ServiceData {
   namespace: NamespaceEdition;
 }

diff --git a/...-analytics/src/pages/services/[serviceId]/backups/fork/_components/ForkForm.component.tsx b/...-analytics/src/pages/services/[serviceId]/backups/fork/_components/ForkForm.component.tsx
@@ -133,10 +133,10 @@ const ForkForm = ({
         },
         plan: data.plan,
         version: data.engineWithVersion.version,
-        ipRestrictions: data.ipRestrictions,
+        ipRestrictions: data.ipRestrictions as database.service.IpRestriction[],
         forkFrom: {
           serviceId: data.forkFrom.serviceId,
-        },
+        } as database.service.creation.ForkFrom,
       };
       if (data.network.type === database.NetworkTypeEnum.private) {
         // endpoint does not expect the network id, but the linked openstackId instead
@@ -150,7 +150,7 @@ const ForkForm = ({
         serviceInfos.disk = {
           size:
             model.result.flavor.storage.minimum.value + data.additionalStorage,
-        };
+        } as database.service.Disk;
       }
       switch (data.forkFrom.type) {
         case ForkSourceType.now:

diff --git a/...pci-databases-analytics/src/pages/services/[serviceId]/databases/add/AddDatabase.spec.tsx b/...pci-databases-analytics/src/pages/services/[serviceId]/databases/add/AddDatabase.spec.tsx
@@ -109,6 +109,8 @@ describe('AddDatabase Component', () => {
   it('should show success toast on successful database addition', async () => {
     vi.mocked(databaseApi.addDatabase).mockResolvedValue({
       name: 'MyDatabase',
+      default: false,
+      id: '',
     });
 
     render(<AddDatabase />, { wrapper: RouterWithQueryClientWrapper });

diff --git a/...es/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/logs/Logs.spec.tsx b/...es/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/logs/Logs.spec.tsx
@@ -30,7 +30,6 @@ const mockService: database.Service = {
   nodes: [],
   plan: '',
   status: database.StatusEnum.READY,
-  region: '',
   storage: null,
   version: '',
   backups: {

diff --git a/...tics/src/pages/services/[serviceId]/namespaces/_components/AddEditNamespace.component.tsx b/...tics/src/pages/services/[serviceId]/namespaces/_components/AddEditNamespace.component.tsx
@@ -109,7 +109,7 @@ const AddEditNamespace = ({
   );
 
   const onSubmit = form.handleSubmit((formValues) => {
-    const retentionFormValues: database.m3db.namespace.Retention = {
+    const retentionFormValues = {
       periodDuration: convertDurationStringToISODuration(
         formValues.periodDuration,
       ),
@@ -124,7 +124,7 @@ const AddEditNamespace = ({
       bufferPastDuration: formValues.bufferPastDuration
         ? convertDurationStringToISODuration(formValues.bufferPastDuration)
         : null,
-    };
+    } as database.m3db.namespace.Retention;
 
     if (isEdition) {
       if (Object.entries(form.formState.dirtyFields).length === 0) {

diff --git a/...databases-analytics/src/pages/services/[serviceId]/pools/_components/AddEditPool.spec.tsx b/...databases-analytics/src/pages/services/[serviceId]/pools/_components/AddEditPool.spec.tsx
@@ -58,7 +58,7 @@ describe('AddEditPool', () => {
         service={mockedService}
         connectionPools={[]}
         databases={[mockedDatabase]}
-        users={[mockedUser as GenericUser]}
+        users={[(mockedUser as unknown) as GenericUser]}
       />,
       {
         wrapper: RouterWithQueryClientWrapper,
@@ -76,7 +76,7 @@ describe('AddEditPool', () => {
         service={mockedService}
         connectionPools={[]}
         databases={[mockedDatabase]}
-        users={[mockedUser as GenericUser]}
+        users={[(mockedUser as unknown) as GenericUser]}
       />,
       {
         wrapper: RouterWithQueryClientWrapper,
@@ -99,7 +99,7 @@ describe('AddEditPool', () => {
         service={mockedService}
         connectionPools={[]}
         databases={[mockedDatabase]}
-        users={[mockedUser as GenericUser]}
+        users={[(mockedUser as unknown) as GenericUser]}
       />,
       {
         wrapper: RouterWithQueryClientWrapper,
@@ -130,7 +130,7 @@ describe('AddEditPool', () => {
         service={mockedService}
         connectionPools={[mockedConnectionPool]}
         databases={[mockedDatabase]}
-        users={[mockedUser as GenericUser]}
+        users={[(mockedUser as unknown) as GenericUser]}
       />,
       {
         wrapper: RouterWithQueryClientWrapper,
@@ -161,7 +161,7 @@ describe('AddEditPool', () => {
         service={mockedService}
         connectionPools={[mockedConnectionPool]}
         databases={[mockedDatabase]}
-        users={[mockedUser as GenericUser]}
+        users={[(mockedUser as unknown) as GenericUser]}
         editedConnectionPool={mockedConnectionPool}
       />,
       {
@@ -196,7 +196,7 @@ describe('AddEditPool', () => {
         service={mockedService}
         connectionPools={[mockedConnectionPool]}
         databases={[mockedDatabase]}
-        users={[mockedUser as GenericUser]}
+        users={[(mockedUser as unknown) as GenericUser]}
       />,
       {
         wrapper: RouterWithQueryClientWrapper,
@@ -226,7 +226,7 @@ describe('AddEditPool', () => {
         service={mockedService}
         connectionPools={[mockedConnectionPool]}
         databases={[mockedDatabase]}
-        users={[mockedUser as GenericUser]}
+        users={[(mockedUser as unknown) as GenericUser]}
       />,
       {
         wrapper: RouterWithQueryClientWrapper,

diff --git a/...cs/src/pages/services/[serviceId]/settings/_components/IpRestrictionsUpdate.component.tsx b/...cs/src/pages/services/[serviceId]/settings/_components/IpRestrictionsUpdate.component.tsx
@@ -68,7 +68,7 @@ const IpsRestrictionsUpdate = ({
       engine: service.engine,
       projectId,
       data: {
-        ipRestrictions: formValues.ipRestrictions as database.IpRestrictionCreation[],
+        ipRestrictions: formValues.ipRestrictions as database.service.IpRestriction[],
       },
     });
   });

diff --git a/...es-analytics/src/pages/services/[serviceId]/settings/update/_components/useUpdateTree.tsx b/...es-analytics/src/pages/services/[serviceId]/settings/update/_components/useUpdateTree.tsx
@@ -17,7 +17,7 @@ export function useUpdateTree(availabilities: database.Availability[]) {
         engine: service.engine,
         flavor: service.flavor,
         plan: service.plan,
-        region: service.region,
+        region: service.nodes[0].region,
         version: service.version,
       },
     ];

diff --git a/...s/pci-databases-analytics/src/pages/services/create/_components/OrderFunnel.component.tsx b/...s/pci-databases-analytics/src/pages/services/create/_components/OrderFunnel.component.tsx
@@ -123,7 +123,7 @@ const OrderFunnel = ({
         serviceInfos.disk = {
           size:
             model.result.flavor.storage.minimum.value + data.additionalStorage,
-        };
+        } as database.service.Disk;
       }
       addService(serviceInfos);
     },