#RI-5750 - update with latest rdi

Author: AmirAllayarovSofteq

redisinsight/api/src/modules/rdi/client/api.rdi.client.ts

@@ -1,7 +1,6 @@
 import axios, { AxiosInstance } from 'axios';
 import { plainToClass } from 'class-transformer';
 import { decode } from 'jsonwebtoken';
-import { Request } from 'express';
 
 import { RdiClient } from 'src/modules/rdi/client/rdi.client';
 import {
@@ -112,21 +111,14 @@ export class ApiRdiClient extends RdiClient {
     }
   }
 
-  async testConnections(config: string, req: Request): Promise<RdiTestConnectionsResponseDto> {
+  async testConnections(config: object): Promise<RdiTestConnectionsResponseDto> {
     try {
-      const abortController = new AbortController();
-      req.socket.on('close', () => {
-        abortController.abort();
-      });
       const response = await this.client.post(
         RdiUrl.TestConnections,
         config,
-        { signal: abortController.signal },
       );
 
-      const actionId = response.data.action_id;
-
-      return this.pollActionStatus(actionId, abortController.signal);
+      return response.data;
     } catch (e) {
       throw wrapRdiPipelineError(e);
     }

redisinsight/api/src/modules/rdi/client/rdi.client.ts

@@ -1,4 +1,3 @@
-import { Request } from 'express';
 import {
   Rdi,
   RdiClientMetadata, RdiPipeline, RdiStatisticsResult,
@@ -38,7 +37,7 @@ export abstract class RdiClient {
 
   abstract dryRunJob(data: RdiDryRunJobDto): Promise<RdiDryRunJobResponseDto>;
 
-  abstract testConnections(config: string, req: Request): Promise<RdiTestConnectionsResponseDto>;
+  abstract testConnections(config: object): Promise<RdiTestConnectionsResponseDto>;
 
   abstract getStatistics(sections?: string): Promise<RdiStatisticsResult>;
 

redisinsight/api/src/modules/rdi/rdi-pipeline.controller.ts

@@ -73,11 +73,10 @@ export class RdiPipelineController {
     responses: [{ status: 200, type: RdiTestConnectionsResponseDto }],
   })
   async testConnections(
-    @Req() req: Request,
-      @RequestRdiClientMetadata() rdiClientMetadata: RdiClientMetadata,
-      @Body() config: string,
+    @RequestRdiClientMetadata() rdiClientMetadata: RdiClientMetadata,
+      @Body() config: object,
   ): Promise<RdiTestConnectionsResponseDto> {
-    return this.rdiPipelineService.testConnections(rdiClientMetadata, config, req);
+    return this.rdiPipelineService.testConnections(rdiClientMetadata, config);
   }
 
   @Get('/strategies')

redisinsight/api/src/modules/rdi/rdi-pipeline.service.ts

@@ -70,12 +70,12 @@ export class RdiPipelineService {
     }
   }
 
-  async testConnections(rdiClientMetadata: RdiClientMetadata, config: string, req: Request): Promise<RdiTestConnectionsResponseDto> {
+  async testConnections(rdiClientMetadata: RdiClientMetadata, config: object): Promise<RdiTestConnectionsResponseDto> {
     this.logger.log('Trying to test connections');
 
     const client = await this.rdiClientProvider.getOrCreate(rdiClientMetadata);
 
-    return await client.testConnections(config, req);
+    return await client.testConnections(config);
   }
 
   async getStrategies(rdiClientMetadata: RdiClientMetadata): Promise<object> {