Merge pull request #51 from dadosfera/beta

Beta

.github/workflows/deploy.yml

@@ -24,7 +24,9 @@ jobs:
         id: extract_environment
 
   deploy:
-    runs-on: self-hosted
+    needs: extract_environment
+    runs-on:
+      [self-hosted, '${{ needs.extract_environment.outputs.environment }}']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -86,6 +88,7 @@ jobs:
       - name: Configure AWS Region
         if: steps.semantic.outputs.new_release_published == 'true'
         uses: aws-actions/configure-aws-credentials@v1
+        id: aws
         with:
           aws-region: us-east-1
 
@@ -112,6 +115,7 @@ jobs:
         env:
           ENV: ${{ steps.extract_environment.outputs.result }}
           IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+          ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           docker-compose -f build.docker-compose.yml build --build-arg NPM_TOKEN=${NPM_TOKEN}
@@ -122,9 +126,11 @@ jobs:
         env:
           ENV: ${{ steps.extract_environment.outputs.result }}
           IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+          ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
         run: |
           sed -i -e "s/\${ENV}/$ENV/g" docker-compose.yml
           sed -i -e "s/\${IMAGE_TAG}/$IMAGE_TAG/g" docker-compose.yml
+          sed -i -e "s/\${ACCOUNT_ID}/$ACCOUNT_ID/g" docker-compose.yml
           zip deploy.zip docker-compose.yml  -r .ebextensions
 
       - name: Deploy AWS Beanstalk

.github/workflows/test.yml

@@ -25,12 +25,14 @@ jobs:
         run: |
           export ENV=test
           export IMAGE_TAG=test
+          export ACCOUNT_ID=test
           docker-compose -f build.docker-compose.yml build --build-arg NPM_TOKEN=${NPM_TOKEN}
 
       - name: Run Test
         env:
           ENV: test
           IMAGE_TAG: test
+          ACCOUNT_ID: test
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           export ENV=test

.releaserc.json

@@ -33,7 +33,9 @@
           { "from": "main", "to": "alpha" },
           { "from": "main", "to": "beta" }
         ],
-        "backmergeStrategy": "merge"
+        "backmergeStrategy": "merge",
+        "clearWorkspace": true,
+        "restoreWorkspace": true
       }
     ],
     "@semantic-release/npm",

build.docker-compose.yml

@@ -2,4 +2,4 @@ version: "3.8"
 services:
   maestro:
     build: .
-    image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG}
+    image: ${ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG}

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   maestro:
-    image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG}
+    image: ${ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG}
     container_name: maestro
     restart: always
     ports:

src/middlewares/authentication.ts

@@ -14,7 +14,6 @@ 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;

src/modules/auth/auth.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Post } from '@nestjs/common';
+import { Body, Controller, Post, UnauthorizedException } from '@nestjs/common';
 
 import { AuthClientService } from 'src/clients/auth/client.service';
 
@@ -18,7 +18,9 @@ export class AuthController {
     const tokens = await this.authClient
       .signIn({ username, password })
       .then((result) => result)
-      .catch((err) => console.log(err));
+      .catch((err) => {
+        throw new UnauthorizedException(err.message);
+      });
 
     return tokens;
   }