Merge pull request #48 from dadosfera/beta

Beta

.github/workflows/deploy.yml

@@ -7,6 +7,22 @@ on:
       - main
 
 jobs:
+  extract_environment:
+    runs-on: ubuntu-latest
+    outputs:
+      environment: ${{ steps.extract_environment.outputs.environment }}
+    steps:
+      - name: Extract Environment
+        run: |
+          if [ ${GITHUB_REF} == "refs/heads/main" ]; then
+            echo "##[set-output name=environment;]$(echo "prd")"
+          elif [ ${GITHUB_REF} == "refs/heads/alpha" ]; then
+            echo "##[set-output name=environment;]$(echo "dev")"
+          elif [ ${GITHUB_REF} == "refs/heads/beta" ]; then
+            echo "##[set-output name=environment;]$(echo "stg")"
+          fi
+        id: extract_environment
+
   deploy:
     runs-on: self-hosted
     steps:
@@ -78,9 +94,11 @@ jobs:
         shell: bash
         run: |
           if [ ${GITHUB_REF} == "refs/heads/main" ]; then
-            echo "##[set-output name=result;]$(echo "production")"
-          else
-            echo "##[set-output name=result;]$(echo ${GITHUB_REF#refs/heads/})"
+            echo "##[set-output name=result;]$(echo "prd")"
+          elif [ ${GITHUB_REF} == "refs/heads/alpha" ]; then
+            echo "##[set-output name=result;]$(echo "dev")"
+          elif [ ${GITHUB_REF} == "refs/heads/beta" ]; then
+            echo "##[set-output name=result;]$(echo "stg")"
           fi
         id: extract_environment
 

.github/workflows/test.yml

@@ -16,6 +16,7 @@ jobs:
       - name: Install Docker Compose
         run: |
           python3 -m pip install docker-compose --upgrade
+
       - name: Build
         env:
           ENV: test
@@ -25,6 +26,7 @@ jobs:
           export ENV=test
           export IMAGE_TAG=test
           docker-compose -f build.docker-compose.yml build --build-arg NPM_TOKEN=${NPM_TOKEN}
+
       - name: Run Test
         env:
           ENV: test
@@ -33,4 +35,10 @@ jobs:
         run: |
           export ENV=test
           export IMAGE_TAG=test
-          docker-compose -f build.docker-compose.yml run -e NPM_TOKEN=${NPM_TOKEN} --rm --entrypoint="npm run test" maestro
+          docker-compose -f build.docker-compose.yml run -e NPM_TOKEN=${NPM_TOKEN} --rm --entrypoint="npm run test" maestro
+
+      - name: Remove Docker's Trash
+        continue-on-error: true
+        run: |
+          docker system prune
+          docker rmi -f $(docker images -aq)

README.md

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

package.json

@@ -30,7 +30,7 @@
     "@nestjs/microservices": "^8.4.3",
     "@nestjs/platform-express": "^8.4.3",
     "@nestjs/swagger": "^5.2.1",
-    "@victorradael/protospack": "^1.3.3",
+    "@victorradael/protospack": "^1.3.9",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
     "grpc": "^1.24.11",

src/clients/inputs/client.service.ts

@@ -148,12 +148,11 @@ export class InputsClientService implements OnModuleInit {
   }
 
   async testConnection(data: ITestConnectionRequest) {
-    console.log('InputClientService', 'TestCOnnection');
-
+    console.log('InputClientService', 'TestConnection');
     const testConnectionResponse = await new Promise((resolve, reject) => {
-      this.inputService.TestConnection(data).subscribe({
+      this.inputService.TestConnection(objectSnakeToCamel(data)).subscribe({
         next(x) {
-          resolve(x);
+          resolve(objectCamelToSnake(x));
         },
         error(err) {
           console.log('Observable Error');

src/middlewares/authentication.ts

@@ -14,6 +14,7 @@ import { HttpExceptionFilter } from 'src/error/http-exception.filter';
 @UseFilters(new HttpExceptionFilter())
 export class LoggerMiddleware implements NestMiddleware {
   use = async (request: Request, response: Response, next: NextFunction) => {
+    console.log('Middle', new Date());
     const idToken = request.get('Dadosfera-User');
     const accessToken = request.get('Authorization');
     const privateKey = process.env.JWT_PRIVATE_KEY;
@@ -27,7 +28,7 @@ export class LoggerMiddleware implements NestMiddleware {
       }
     });
     const jwtDecoded: any = decode(idToken);
-    console.log(jwtDecoded);
+
     const permissions = jwtDecoded.user.permissions;
     const clienId = jwtDecoded.user.customerId;
     const userId = jwtDecoded.user.id;
@@ -94,29 +95,31 @@ const verifyToken = async (accessToken: string) => {
 
   try {
     await setUp(awsRegion, awsPoolId);
-    if (accessToken) {
-      const user: any = decode(accessToken, { complete: true });
-
-      if (user === null) {
-        throw new UnauthorizedException();
-      }
-
-      const { kid } = user.header;
-      const pem = pems.filter((item: any) => item[kid]);
-      const pemValue: any = pem[0][kid];
-
-      if (!pem) {
-        throw new UnauthorizedException();
-      }
-
-      verify(accessToken, pemValue, (err: any) => {
-        if (err) {
-          throw new UnauthorizedException();
-        }
-
-        return;
-      });
+    if (!accessToken) {
+      throw new UnauthorizedException();
     }
+
+    const user: any = decode(accessToken, { complete: true });
+
+    if (user === null) {
+      throw new UnauthorizedException();
+    }
+
+    const { kid } = user.header;
+    const pem = pems.filter((item: any) => item[kid]);
+    const pemValue: any = pem[0][kid];
+
+    if (!pem) {
+      throw new UnauthorizedException();
+    }
+
+    verify(accessToken, pemValue, (err: any) => {
+      if (err) {
+        throw new UnauthorizedException();
+      }
+
+      return;
+    });
   } catch (error) {
     throw new UnauthorizedException();
   }

src/modules/inputs/inputs.controller.ts

@@ -18,12 +18,10 @@ import {
 export class InputsController {
   constructor(private inputsClientService: InputsClientService) {}
 
-  @Get('/test-connection')
+  @Post('/test-connection')
   async testConnection(@Body() data) {
     console.log(`/test-connection`, 'ON TEST CONNECTION ROUTE');
 
-    console.log(data);
-
     const inputService = new InputsService(this.inputsClientService);
     const response = await inputService.testConnection(data);
 

src/utils/CaseConverter.ts

@@ -41,8 +41,8 @@ export const objectSnakeToCamel = (object) => {
       delete object[key];
     }
   });
-
   objectValues.forEach((value) => {
+    if (value == null) return;
     if (typeof value === 'object') {
       objectSnakeToCamel(value);
     }

swagger.json

@@ -1 +1 @@
-{"openapi":"3.0.0","paths":{"/inputs/test-connection":{"get":{"operationId":"InputsController_testConnection","parameters":[],"responses":{"200":{"description":""}}}},"/inputs":{"post":{"operationId":"InputsController_create","parameters":[],"responses":{"201":{"description":""}}},"get":{"operationId":"InputsController_findAll","parameters":[],"responses":{"200":{"description":""}}}},"/inputs/{id}":{"get":{"operationId":"InputsController_findOne","parameters":[],"responses":{"200":{"description":""}}},"put":{"operationId":"InputsController_update","parameters":[],"responses":{"200":{"description":""}}},"delete":{"operationId":"InputsController_delete","parameters":[],"responses":{"200":{"description":""}}}},"/transformations":{"post":{"operationId":"TransformationsController_create","parameters":[],"responses":{"201":{"description":""}}},"get":{"operationId":"TransformationsController_findAll","parameters":[],"responses":{"200":{"description":""}}}},"/transformations/{id}":{"get":{"operationId":"TransformationsController_findOne","parameters":[],"responses":{"200":{"description":""}}},"put":{"operationId":"TransformationsController_update","parameters":[],"responses":{"200":{"description":""}}},"delete":{"operationId":"TransformationsController_delete","parameters":[],"responses":{"200":{"description":""}}}},"/outputs":{"post":{"operationId":"OutputsController_create","parameters":[],"responses":{"201":{"description":""}}},"get":{"operationId":"OutputsController_findAll","parameters":[],"responses":{"200":{"description":""}}}},"/outputs/{id}":{"get":{"operationId":"OutputsController_findOne","parameters":[],"responses":{"200":{"description":""}}},"put":{"operationId":"OutputsController_update","parameters":[],"responses":{"200":{"description":""}}},"delete":{"operationId":"OutputsController_delete","parameters":[],"responses":{"200":{"description":""}}}},"/pipelines/{id}/status":{"get":{"operationId":"PipelinesController_getPipelineStatus","parameters":[],"responses":{"200":{"description":""}}}},"/pipelines/{id}/{details}":{"get":{"operationId":"PipelinesController_getPipelineLogs","parameters":[],"responses":{"200":{"description":""}}}},"/pipelines":{"post":{"operationId":"PipelinesController_create","parameters":[],"responses":{"201":{"description":""}}},"get":{"operationId":"PipelinesController_findAll","parameters":[],"responses":{"200":{"description":""}}}},"/pipelines/{id}":{"get":{"operationId":"PipelinesController_findOne","parameters":[],"responses":{"200":{"description":""}}},"put":{"operationId":"PipelinesController_update","parameters":[],"responses":{"200":{"description":""}}},"delete":{"operationId":"PipelinesController_delete","parameters":[],"responses":{"200":{"description":""}}}},"/auth":{"post":{"operationId":"AuthController_signIn","parameters":[],"responses":{"201":{"description":""}}}},"/health":{"get":{"operationId":"HealthController_check","parameters":[],"responses":{"200":{"description":""}}}}},"info":{"title":"Maestro Grpc Documentation","description":"Documentation for Maestro gateway","version":"1.0","contact":{}},"tags":[],"servers":[],"components":{"securitySchemes":{"bearer":{"scheme":"bearer","bearerFormat":"JWT","type":"http"}},"schemas":{}}}
+{"openapi":"3.0.0","paths":{"/inputs/test-connection":{"post":{"operationId":"InputsController_testConnection","parameters":[],"responses":{"201":{"description":""}}}},"/inputs":{"post":{"operationId":"InputsController_create","parameters":[],"responses":{"201":{"description":""}}},"get":{"operationId":"InputsController_findAll","parameters":[],"responses":{"200":{"description":""}}}},"/inputs/{id}":{"get":{"operationId":"InputsController_findOne","parameters":[],"responses":{"200":{"description":""}}},"put":{"operationId":"InputsController_update","parameters":[],"responses":{"200":{"description":""}}},"delete":{"operationId":"InputsController_delete","parameters":[],"responses":{"200":{"description":""}}}},"/transformations":{"post":{"operationId":"TransformationsController_create","parameters":[],"responses":{"201":{"description":""}}},"get":{"operationId":"TransformationsController_findAll","parameters":[],"responses":{"200":{"description":""}}}},"/transformations/{id}":{"get":{"operationId":"TransformationsController_findOne","parameters":[],"responses":{"200":{"description":""}}},"put":{"operationId":"TransformationsController_update","parameters":[],"responses":{"200":{"description":""}}},"delete":{"operationId":"TransformationsController_delete","parameters":[],"responses":{"200":{"description":""}}}},"/outputs":{"post":{"operationId":"OutputsController_create","parameters":[],"responses":{"201":{"description":""}}},"get":{"operationId":"OutputsController_findAll","parameters":[],"responses":{"200":{"description":""}}}},"/outputs/{id}":{"get":{"operationId":"OutputsController_findOne","parameters":[],"responses":{"200":{"description":""}}},"put":{"operationId":"OutputsController_update","parameters":[],"responses":{"200":{"description":""}}},"delete":{"operationId":"OutputsController_delete","parameters":[],"responses":{"200":{"description":""}}}},"/pipelines/{id}/status":{"get":{"operationId":"PipelinesController_getPipelineStatus","parameters":[],"responses":{"200":{"description":""}}}},"/pipelines/{id}/{details}":{"get":{"operationId":"PipelinesController_getPipelineLogs","parameters":[],"responses":{"200":{"description":""}}}},"/pipelines":{"post":{"operationId":"PipelinesController_create","parameters":[],"responses":{"201":{"description":""}}},"get":{"operationId":"PipelinesController_findAll","parameters":[],"responses":{"200":{"description":""}}}},"/pipelines/{id}":{"get":{"operationId":"PipelinesController_findOne","parameters":[],"responses":{"200":{"description":""}}},"put":{"operationId":"PipelinesController_update","parameters":[],"responses":{"200":{"description":""}}},"delete":{"operationId":"PipelinesController_delete","parameters":[],"responses":{"200":{"description":""}}}},"/auth":{"post":{"operationId":"AuthController_signIn","parameters":[],"responses":{"201":{"description":""}}}},"/health":{"get":{"operationId":"HealthController_check","parameters":[],"responses":{"200":{"description":""}}}}},"info":{"title":"Maestro Grpc Documentation","description":"Documentation for Maestro gateway","version":"1.0","contact":{}},"tags":[],"servers":[],"components":{"securitySchemes":{"bearer":{"scheme":"bearer","bearerFormat":"JWT","type":"http"}},"schemas":{}}}