Merge pull request #555 from bartoval/refactor_services_references

refactor: ♻️ Rename all address references
skupperproject · Jan 20, 2025 · 59df9f8 · 59df9f8
2 parents fe7d452 + 29c6070
commit 59df9f8
Show file tree

Hide file tree

Showing 21 changed files with 151 additions and 168 deletions.
diff --git a/__tests__/MetricLatency.spec.tsx b/__tests__/MetricLatency.spec.tsx
@@ -6,7 +6,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import * as PrometheusAPIModule from '../src/API/Prometheus.api';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
@@ -15,7 +14,7 @@ import LoadingPage from '../src/core/components/SkLoading';
 import Latency from '../src/pages/shared/Metrics/components/Latency';
 import { Providers } from '../src/providers';
 
-const processResult = processesData.results[0] as extendedProcessResponse;
+const processResult = processesData.results[0];
 
 describe('Latency component', () => {
   let server: Server;

diff --git a/__tests__/MetricRequest.spec.tsx b/__tests__/MetricRequest.spec.tsx
@@ -6,7 +6,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import * as PrometheusAPIModule from '../src/API/Prometheus.api';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
@@ -15,7 +14,7 @@ import LoadingPage from '../src/core/components/SkLoading';
 import Request from '../src/pages/shared/Metrics/components/Request';
 import { Providers } from '../src/providers';
 
-const processResult = processesData.results[0] as extendedProcessResponse;
+const processResult = processesData.results[0];
 
 describe('Request component', () => {
   let server: Server;

diff --git a/__tests__/MetricTcpConnection.spec.tsx b/__tests__/MetricTcpConnection.spec.tsx
@@ -6,7 +6,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import * as PrometheusAPIModule from '../src/API/Prometheus.api';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
@@ -15,7 +14,7 @@ import LoadingPage from '../src/core/components/SkLoading';
 import TcpConnection from '../src/pages/shared/Metrics/components/TcpConnection';
 import { Providers } from '../src/providers';
 
-const processResult = processesData.results[0] as extendedProcessResponse;
+const processResult = processesData.results[0];
 
 describe('Tcp component', () => {
   let server: Server;

diff --git a/__tests__/MetricTraffic.spec.tsx b/__tests__/MetricTraffic.spec.tsx
@@ -6,7 +6,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
 import { getTestsIds } from '../src/config/testIds';
@@ -15,7 +14,7 @@ import Traffic from '../src/pages/shared/Metrics/components/Traffic';
 import * as MetricsModule from '../src/pages/shared/Metrics/services/index';
 import { Providers } from '../src/providers';
 
-const processResult = processesData.results[0] as extendedProcessResponse;
+const processResult = processesData.results[0];
 
 describe('Traffic component', () => {
   let server: Server;

diff --git a/__tests__/Process.spec.tsx b/__tests__/Process.spec.tsx
@@ -6,7 +6,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
 import { getTestsIds } from '../src/config/testIds';
@@ -15,7 +14,7 @@ import Process from '../src/pages/Processes/views/Process';
 import { Providers } from '../src/providers';
 import { setMockUseParams } from '../vite.setup';
 
-const processResult = processesData.results[0] as extendedProcessResponse;
+const processResult = processesData.results[0];
 
 setMockUseParams({ id: `${processResult.name}@${processResult.identity}` });
 

diff --git a/__tests__/ProcessDetails.spec.tsx b/__tests__/ProcessDetails.spec.tsx
@@ -6,13 +6,13 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import LoadingPage from '../src/core/components/SkLoading';
 import Details from '../src/pages/Processes/components/Details';
 import { Providers } from '../src/providers';
+import { ProcessResponse } from '../src/types/REST.interfaces';
 import { setMockUseParams } from '../vite.setup';
 
-const processResult = processesData.results[0] as extendedProcessResponse;
+const processResult = processesData.results[0] as ProcessResponse;
 
 setMockUseParams({ id: `${processResult.name}@${processResult.identity}` });
 

diff --git a/__tests__/ProcessPairsList.spec.tsx b/__tests__/ProcessPairsList.spec.tsx
@@ -7,7 +7,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import processesPairsData from '../mocks/data/PROCESS_PAIRS.json';
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
 import { getTestsIds } from '../src/config/testIds';
@@ -18,7 +17,7 @@ import { ProcessesRoutesPaths } from '../src/pages/Processes/Processes.enum';
 import { Providers } from '../src/providers';
 import { ProcessResponse, PairsResponse } from '../src/types/REST.interfaces';
 
-const data = processesData.results[0] as extendedProcessResponse;
+const data = processesData.results[0] as ProcessResponse;
 const dataNoPairs = {
   endTime: 0,
   identity: 'no-pairs',

diff --git a/__tests__/Response.spec.tsx b/__tests__/Response.spec.tsx
@@ -6,7 +6,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import * as PrometheusAPIModule from '../src/API/Prometheus.api';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
@@ -15,7 +14,7 @@ import LoadingPage from '../src/core/components/SkLoading';
 import Response from '../src/pages/shared/Metrics/components/Response';
 import { Providers } from '../src/providers';
 
-const processResult = processesData.results[0] as extendedProcessResponse;
+const processResult = processesData.results[0];
 
 describe('Response component', () => {
   let server: Server;

diff --git a/__tests__/Services.services.spec.ts b/__tests__/Services.services.spec.ts
@@ -8,8 +8,8 @@ import { ServicesController, aggregateConnectorResponses } from '../src/pages/Se
 import { GraphElementNames, GraphIconKeys } from '../src/types/Graph.interfaces';
 import { ConnectorResponse, ListenerResponse } from '../src/types/REST.interfaces';
 
-const connectorResults = connectorsData.results as any[];
-const listenerResults = listenersData.results as any[];
+const connectorResults = connectorsData.results;
+const listenerResults = listenersData.results;
 
 describe('ServicesController', () => {
   describe('convertPairsToSankeyChartData', () => {
@@ -77,8 +77,8 @@ describe('ServicesController', () => {
 
       const expected = [
         {
-          destinationId: undefined,
-          destinationName: undefined,
+          destinationId: 'adr-7375c1d0dcc0c921',
+          destinationName: 'adservice',
           siteId: '46c2efa0-5fbc-4fe4-bba8-530e775aa2f6-listener',
           siteName: 'dallas',
           sourceId: 'rrrpk:10',
@@ -87,8 +87,8 @@ describe('ServicesController', () => {
           iconName: 'listener'
         },
         {
-          destinationId: undefined,
-          destinationName: undefined,
+          destinationId: 'adr-28bab4448f1c9a48',
+          destinationName: 'cartservice',
           siteId: '46c2efa0-5fbc-4fe4-bba8-530e775aa2f6-listener',
           siteName: 'dallas',
           sourceId: 'rrrpk:11',
@@ -149,16 +149,16 @@ describe('ServicesController', () => {
           destinationId: 'shippingservice@172.17.27.114-46c2efa0-5fbc-4fe4-bba8-530e775aa2f6-50051',
           destinationName: '[email protected]:50051',
           iconName: 'routingKey',
-          sourceId: undefined,
-          sourceName: undefined,
+          sourceId: 'adr-00ffe0b268c6eae4',
+          sourceName: 'shippingservice',
           type: 'SkEmptyNode'
         },
         {
           destinationId: 'paymentservice@172.17.27.110-46c2efa0-5fbc-4fe4-bba8-530e775aa2f6-50051',
           destinationName: '[email protected]:50051',
           iconName: 'routingKey',
-          sourceId: undefined,
-          sourceName: undefined,
+          sourceId: 'adr-97d6f0970aa36488',
+          sourceName: 'paymentservice',
           type: 'SkEmptyNode'
         }
       ];
@@ -287,8 +287,8 @@ describe('ServicesController', () => {
 
       expect(aggregated).toEqual([
         {
-          address: 'shippingservice',
-          addressId: 'adr-00ffe0b268c6eae4',
+          routingKey: 'shippingservice',
+          serviceId: 'adr-00ffe0b268c6eae4',
           count: 1,
           destHost: '172.17.27.114',
           destPort: '50051',
@@ -299,8 +299,8 @@ describe('ServicesController', () => {
           processId: '8483cbc9-c1ba-41e2-8648-eac3dfccaea0',
           processes: [
             {
-              address: 'shippingservice',
-              addressId: 'adr-00ffe0b268c6eae4',
+              routingKey: 'shippingservice',
+              serviceId: 'adr-00ffe0b268c6eae4',
               destHost: '172.17.27.114',
               endTime: 0,
               destPort: '50051',
@@ -323,8 +323,8 @@ describe('ServicesController', () => {
         },
 
         {
-          address: 'paymentservice',
-          addressId: 'adr-97d6f0970aa36488',
+          routingKey: 'paymentservice',
+          serviceId: 'adr-97d6f0970aa36488',
           count: 1,
           destHost: '172.17.27.110',
           destPort: '50051',
@@ -335,8 +335,8 @@ describe('ServicesController', () => {
           processId: '07ef190a-6167-4297-9ecd-ea0dcbf6c5a1',
           processes: [
             {
-              address: 'paymentservice',
-              addressId: 'adr-97d6f0970aa36488',
+              routingKey: 'paymentservice',
+              serviceId: 'adr-97d6f0970aa36488',
               destHost: '172.17.27.110',
               destPort: '50051',
               endTime: 0,
@@ -359,8 +359,8 @@ describe('ServicesController', () => {
         },
 
         {
-          address: 'emailservice',
-          addressId: 'adr-5193d597cb3d8442',
+          routingKey: 'emailservice',
+          serviceId: 'adr-5193d597cb3d8442',
           destHost: '172.17.27.116',
           destPort: '5000',
           endTime: 0,
@@ -371,8 +371,8 @@ describe('ServicesController', () => {
           count: 1,
           processes: [
             {
-              address: 'emailservice',
-              addressId: 'adr-5193d597cb3d8442',
+              routingKey: 'emailservice',
+              serviceId: 'adr-5193d597cb3d8442',
               destHost: '172.17.27.116',
               destPort: '5000',
               endTime: 0,

diff --git a/__tests__/Site.spec.tsx b/__tests__/Site.spec.tsx
@@ -7,19 +7,18 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import processesData from '../mocks/data/PROCESSES.json';
 import sitesData from '../mocks/data/SITES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
 import { getTestsIds } from '../src/config/testIds';
 import LoadingPage from '../src/core/components/SkLoading';
 import { ProcessesRoutesPaths } from '../src/pages/Processes/Processes.enum';
 import Site from '../src/pages/Sites/views/Site';
 import { Providers } from '../src/providers';
-import { SiteResponse } from '../src/types/REST.interfaces';
+import { ProcessResponse, SiteResponse } from '../src/types/REST.interfaces';
 import { setMockUseParams } from '../vite.setup';
 
 const siteResults = sitesData.results as SiteResponse[];
-const processResults = processesData.results as extendedProcessResponse[];
+const processResults = processesData.results as ProcessResponse[];
 
 setMockUseParams({ id: `${siteResults[0].name}@${siteResults[0].identity}` });
 

diff --git a/__tests__/TopologyDetails.spec.tsx b/__tests__/TopologyDetails.spec.tsx
@@ -5,14 +5,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import processesPairsData from '../mocks/data/PROCESS_PAIRS.json';
 import processesData from '../mocks/data/PROCESSES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
-import { mapResponseProperties } from '../src/API/REST.utils';
 import { DEFAULT_COMPLEX_STRING_SEPARATOR } from '../src/config/app';
 import TopologyDetails from '../src/pages/Topology/components/TopologyDetails';
 import { Providers } from '../src/providers';
-import { ProcessPairsResponse } from '../src/types/REST.interfaces';
+import { ProcessPairsResponse, ProcessResponse } from '../src/types/REST.interfaces';
 
-const processesResults = mapResponseProperties(processesData.results, 'toFrontend') as extendedProcessResponse[];
+const processesResults = processesData.results as ProcessResponse[];
 const processPairsResults = processesPairsData.results as ProcessPairsResponse[];
 
 describe('Topology details', () => {

diff --git a/__tests__/TopologyProcesses.spec.tsx b/__tests__/TopologyProcesses.spec.tsx
@@ -10,7 +10,6 @@ import processesPairsData from '../mocks/data/PROCESS_PAIRS.json';
 import processesData from '../mocks/data/PROCESSES.json';
 import servicesData from '../mocks/data/SERVICES.json';
 import { loadMockServer } from '../mocks/server';
-import { extendedProcessResponse } from '../mocks/server.API';
 import { waitForElementToBeRemovedTimeout } from '../src/config/app';
 import { Labels } from '../src/config/labels';
 import { getTestsIds } from '../src/config/testIds';
@@ -23,10 +22,10 @@ import { TopologyController } from '../src/pages/Topology/services';
 import { convertProcessToNode } from '../src/pages/Topology/services/topologyProcessController';
 import { Providers } from '../src/providers';
 import { SkGraphProps } from '../src/types/Graph.interfaces';
-import { ProcessPairsResponse, ServiceResponse } from '../src/types/REST.interfaces';
+import { ProcessPairsResponse, ProcessResponse, ServiceResponse } from '../src/types/REST.interfaces';
 import { mockNavigate } from '../vite.setup';
 
-const processesResults = processesData.results as extendedProcessResponse[];
+const processesResults = processesData.results as ProcessResponse[];
 const processesPairsResults = processesPairsData.results as ProcessPairsResponse[];
 const serviceResults = servicesData.results as ServiceResponse[];