Merge pull request #75 from dadosfera/beta

Beta -> Main

.github/workflows/deploy.yml

@@ -23,19 +23,15 @@ jobs:
           fi
         id: extract_environment
 
-  deploy:
-    needs: extract_environment
-    runs-on:
-      [self-hosted, '${{ needs.extract_environment.outputs.environment }}']
+  semantic_release:
+    runs-on: ubuntu-latest
+    outputs:
+      new_release_published: ${{ steps.semantic.outputs.new_release_published }}
+      new_release_version: ${{ steps.semantic.outputs.new_release_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # Because Semantic Realese deleted the .npmrc file, it was necessary to insert two steps to backup the file.
-      - name: BKP .npmrc Step 1
-        run: |
-          cp .npmrc .npmrcbkp
-
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v2
         id: semantic
@@ -60,40 +56,43 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      # Because Semantic Realese deleted the .npmrc file, it was necessary to insert two steps to backup the file.
-      - name: BKP .npmrc Step 2
-        run: |
-          cp .npmrcbkp .npmrc
+  deploy:
+    needs: [extract_environment, semantic_release]
+    runs-on: [self-hosted, "${{ needs.extract_environment.outputs.environment }}"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
       - name: Update Pip
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         run: |
           python3 -m pip install --upgrade pip
 
       - name: Install Docker Compose
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         run: |
           python3 -m pip install docker-compose --upgrade
 
       - name: Install AWS CLI
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         run: |
           python3 -m pip install awscli --upgrade
 
       - name: Install AWS Elastic Beanstalk CLI
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         run: |
           python3 -m pip install awsebcli --upgrade
 
       - name: Configure AWS Region
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         uses: aws-actions/configure-aws-credentials@v1
         id: aws
         with:
           aws-region: us-east-1
 
       - name: Extract Environment
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         shell: bash
         run: |
           if [ ${GITHUB_REF} == "refs/heads/main" ]; then
@@ -106,15 +105,15 @@ jobs:
         id: extract_environment
 
       - name: Login to AWS ECR
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         id: login_ecr
         uses: aws-actions/amazon-ecr-login@v1
 
       - name: Build, Tag, and Push Image to AWS ECR
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         env:
           ENV: ${{ steps.extract_environment.outputs.result }}
-          IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+          IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
           ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
@@ -122,10 +121,10 @@ jobs:
           docker-compose -f build.docker-compose.yml push
 
       - name: Create ZIP file to Deploy AWS Beanstalk
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         env:
           ENV: ${{ steps.extract_environment.outputs.result }}
-          IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+          IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
           ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
         run: |
           sed -i -e "s/\${ENV}/$ENV/g" docker-compose.yml
@@ -134,13 +133,14 @@ jobs:
           zip deploy.zip docker-compose.yml  -r .ebextensions
 
       - name: Deploy AWS Beanstalk
-        if: steps.semantic.outputs.new_release_published == 'true'
+        if: needs.semantic_release.outputs.new_release_published == 'true'
         env:
           ENV: ${{ steps.extract_environment.outputs.result }}
           AWS_REGION: us-east-1
           APP_NAME: maestro
         run: |
           eb use $APP_NAME-$ENV
+          echo -e "deploy:\n  artifact: deploy.zip" >> .elasticbeanstalk/config.yml
           eb deploy
 
       - name: Remove Docker's Trash

README.md

@@ -1,4 +1,4 @@
 <p align="center">
   <image src="./assets/maestro.svg" style="width:10rem">
   <h1 align="center">Maestro</h1> 
-</p>  
+</p>

package.json

@@ -33,7 +33,6 @@
     "@victorradael/protospack": "^1.5.5",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
-    "grpc": "^1.24.11",
     "helmet": "^5.0.2",
     "jsonwebtoken": "^8.5.1",
     "jwk-to-pem": "^2.0.5",

src/clients/inputs/client.service.ts

@@ -1,16 +1,16 @@
 import { OnModuleInit, Inject } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
-import { InputService } from '@victorradael/protospack';
+import {
+  InputNewCreateRequest,
+  InputService,
+  TestConnectionGetColumnsRequest,
+  TestConnectionRequest,
+} from '@victorradael/protospack';
 import {
   objectCamelToSnake,
   objectSnakeToCamel,
 } from 'src/utils/CaseConverter';
-import {
-  ICreateInputRequest,
-  IIdRequest,
-  ITestConnectionRequest,
-  UpdateInputRequest,
-} from './interfaces';
+import { IIdRequest, UpdateInputRequest } from './interfaces';
 
 export class InputsClientService implements OnModuleInit {
   private inputService: InputService;
@@ -23,22 +23,24 @@ export class InputsClientService implements OnModuleInit {
       this.grpcClient.getService<InputService>('InputService');
   }
 
-  async create(createInputDto: ICreateInputRequest) {
+  async create(createInputDto: InputNewCreateRequest) {
     console.log('InputClientService', 'Create');
 
     const createInputResponse = await new Promise((resolve, reject) => {
-      this.inputService.Create(objectSnakeToCamel(createInputDto)).subscribe({
-        next(x) {
-          resolve(objectCamelToSnake(x));
-        },
-        error(err) {
-          console.log('Observable Error');
-          reject(err);
-        },
-        complete() {
-          console.log('done');
-        },
-      });
+      this.inputService
+        .NewCreate(objectSnakeToCamel(createInputDto))
+        .subscribe({
+          next(x) {
+            resolve(objectCamelToSnake(x));
+          },
+          error(err) {
+            console.log('Observable Error');
+            reject(err);
+          },
+          complete() {
+            console.log('done');
+          },
+        });
     })
       .then((res) => res)
       .catch((err) => {
@@ -147,10 +149,10 @@ export class InputsClientService implements OnModuleInit {
     return removeInputResponse;
   }
 
-  async testConnection(data: ITestConnectionRequest) {
+  async testConnection(data: TestConnectionRequest) {
     console.log('InputClientService', 'TestConnection');
     const testConnectionResponse = await new Promise((resolve, reject) => {
-      this.inputService.TestConnection(objectSnakeToCamel(data)).subscribe({
+      this.inputService.NewTestConnection(objectSnakeToCamel(data)).subscribe({
         next(x) {
           resolve(objectCamelToSnake(x));
         },
@@ -170,4 +172,28 @@ export class InputsClientService implements OnModuleInit {
 
     return testConnectionResponse;
   }
+
+  async getColumns(data: TestConnectionGetColumnsRequest) {
+    console.log('InputClientService', 'TestConnection/Get-Columns');
+    const getColumnsResponse = await new Promise((resolve, reject) => {
+      this.inputService.GetColumns(objectSnakeToCamel(data)).subscribe({
+        next(x) {
+          resolve(objectCamelToSnake(x));
+        },
+        error(err) {
+          console.log('Observable Error');
+          reject(err);
+        },
+        complete() {
+          console.log('done');
+        },
+      });
+    })
+      .then((res) => res)
+      .catch((err) => {
+        throw new Error(err);
+      });
+
+    return getColumnsResponse;
+  }
 }

src/modules/inputs/inputs.controller.ts

@@ -9,10 +9,8 @@ import {
 } from '@nestjs/common';
 import { InputsService } from './inputs.service';
 import { InputsClientService } from 'src/clients/inputs/client.service';
-import {
-  ICreateInputRequest,
-  UpdateInputRequest,
-} from 'src/clients/inputs/interfaces';
+import { UpdateInputRequest } from 'src/clients/inputs/interfaces';
+import { InputNewCreateRequest } from '@victorradael/protospack';
 
 @Controller('inputs')
 export class InputsController {
@@ -28,8 +26,21 @@ export class InputsController {
     return response;
   }
 
+  @Post('/test-connection/get-columns')
+  async getColumns(@Body() data) {
+    console.log(
+      `/test-connection/get-columns`,
+      'ON TEST CONNECTION GET COLUMNS ROUTE',
+    );
+
+    const inputService = new InputsService(this.inputsClientService);
+    const response = await inputService.getColumns(data);
+
+    return response;
+  }
+
   @Post()
-  async create(@Body() createInputDto: ICreateInputRequest) {
+  async create(@Body() createInputDto: InputNewCreateRequest) {
     console.log(`/input`, 'ON CREATE ROUTE');
 
     const inputService = new InputsService(this.inputsClientService);

src/modules/inputs/inputs.service.ts

@@ -1,16 +1,13 @@
 import { Body, HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import { InputNewCreateRequest } from '@victorradael/protospack';
 import { InputsClientService } from 'src/clients/inputs/client.service';
-import {
-  ICreateInputRequest,
-  IIdRequest,
-  Info,
-} from 'src/clients/inputs/interfaces';
+import { IIdRequest, Info } from 'src/clients/inputs/interfaces';
 
 @Injectable()
 export class InputsService {
   constructor(private inputClient: InputsClientService) {}
 
-  async create(@Body() data: ICreateInputRequest) {
+  async create(@Body() data: InputNewCreateRequest) {
     try {
       const createInputResponse = await this.inputClient.create(data);
 
@@ -74,4 +71,15 @@ export class InputsService {
       throw new HttpException(err.message, HttpStatus.NOT_FOUND);
     }
   }
+
+  async getColumns(data) {
+    try {
+      const testConnectionGetColumnsResponse =
+        await this.inputClient.getColumns(data);
+
+      return testConnectionGetColumnsResponse;
+    } catch (err) {
+      throw new HttpException(err.message, HttpStatus.NOT_FOUND);
+    }
+  }
 }