Merge pull request #98 from dadosfera/beta

Beta -> main

package-lock.json

@@ -19,7 +19,7 @@
         "@nestjs/platform-express": "^8.4.3",
         "@nestjs/schedule": "^1.1.0",
         "@nestjs/swagger": "^5.2.1",
-        "@victorradael/protospack": "^2.3.0",
+        "@victorradael/protospack": "2.3.0",
         "axios": "^0.25.0",
         "dotenv": "^14.2.0",
         "helmet": "^5.0.2",

src/clients/inputs/client.service.ts

@@ -1,6 +1,7 @@
 import { OnModuleInit, Inject } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
 import {
+  InputCreateResponse,
   InputCreateS3Request,
   InputNewCreateRequest,
   InputService,
@@ -42,11 +43,9 @@ export class InputsClientService implements OnModuleInit {
             console.log('done');
           },
         });
-    })
-      .then((res) => res)
-      .catch((err) => {
-        throw new Error(err);
-      });
+    }).catch((err) => {
+      throw new Error(err);
+    });
 
     return createInputResponse;
   }

src/modules/inputs/inputs.service.ts

@@ -15,13 +15,17 @@ export class InputsService {
         data.plugin == 'parquet'
       ) {
         const { info, ...input } = data;
+        const inputPayload = this.generateInputS3Payload(input);
         const createInputResponse = await this.inputClient.createS3Inputs({
-          input,
+          input: inputPayload,
           info,
         });
         return createInputResponse;
       } else {
-        const createInputResponse = await this.inputClient.create(data);
+        const createInputResponse: any = await this.inputClient.create(data);
+        if (createInputResponse?.input?.input_jdbc) {
+          return { input: createInputResponse?.input?.input_jdbc };
+        }
         return createInputResponse;
       }
     } catch (err) {
@@ -95,4 +99,29 @@ export class InputsService {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
     }
   }
+
+  generateInputS3Payload(payload) {
+    const { credentials, plugin } = payload;
+    if (!credentials) return payload;
+
+    const {
+      client_aws_access_key_id,
+      client_aws_secret_access_key,
+      file_format_params,
+      format_file_params,
+      client_bucket,
+      file_to_extract,
+    } = credentials;
+    const formatedPayload = {
+      plugin,
+      source_bucket: client_bucket,
+      source_prefix: file_to_extract,
+      auth_parameters: {
+        aws_access_key_id: client_aws_access_key_id,
+        aws_secret_access_key: client_aws_secret_access_key,
+      },
+      file_format_params: file_format_params || format_file_params,
+    };
+    return formatedPayload;
+  }
 }