diff --git a/src/modules/pipelines/pipelines.service.ts b/src/modules/pipelines/pipelines.service.ts index 24b00f4..d6aecd8 100644 --- a/src/modules/pipelines/pipelines.service.ts +++ b/src/modules/pipelines/pipelines.service.ts @@ -10,25 +10,11 @@ export class PipelinesService { constructor(private pipelineClient: PipelinesClientService) {} adjustPayload(payload) { - const { input } = payload; - if (input) { - if (input.input_generic) { - const { credentials } = input.input_generic; - return { - ...input.input_generic, - credentials: credentials && JSON.parse(credentials), - }; - } - if (input.input_s3) return input.input_s3; - if (input.input_jdbc) return input.input_jdbc; - - const { credentials } = input; - return { - ...input, - credentials: credentials && JSON.parse(credentials), - }; + if (payload.input?.input_generic) { + payload.input = DecodeGrpcStruct(payload.input?.input_generic); + } else { + payload.input = payload.input?.input_s3 || payload.input?.input_jdbc; } - return input; } async create(createPipelineDto) { diff --git a/src/modules/pipelinesV2/pipelines.service.ts b/src/modules/pipelinesV2/pipelines.service.ts index d563212..e7bc738 100644 --- a/src/modules/pipelinesV2/pipelines.service.ts +++ b/src/modules/pipelinesV2/pipelines.service.ts @@ -43,6 +43,28 @@ export class PipelinesService implements OnModuleInit { ); } + adjustInputPayload(payload) { + const { input } = payload; + if (input) { + if (input.input_generic) { + const { credentials } = input.input_generic; + return { + ...input.input_generic, + credentials: credentials && JSON.parse(credentials), + }; + } + if (input.input_s3) return input.input_s3; + if (input.input_jdbc) return input.input_jdbc; + + const { credentials } = input; + return { + ...input, + credentials: credentials && JSON.parse(credentials), + }; + } + return input; + } + async create( body: ICreatePipelineV2Req, metadata, @@ -103,15 +125,11 @@ export class PipelinesService implements OnModuleInit { const findOnePipelineResponse = await lastValueFrom( this.pipelineReadService.PipelineV2FindOne(data, metadata), - ) - .then((res) => { - this.logger.info('Done'); - return res; - }) - .catch((err) => { - this.logger.error(err.message); - throw new Error(err); - }); + ).catch((err) => { + this.logger.error(err.message); + throw new Error(err); + }); + this.logger.info('Done'); return findOnePipelineResponse; }