FIX: CI

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:
@@ -70,6 +86,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
 
@@ -78,9 +95,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
 
@@ -94,6 +113,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}
@@ -104,9 +124,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

@@ -16,6 +16,7 @@ jobs:
       - name: Install Docker Compose
         run: |
           python3 -m pip install docker-compose --upgrade
+
       - name: Build
         env:
           ENV: test
@@ -24,13 +25,22 @@ 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
           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)

.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",

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>

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,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();
   }