Merge pull request #70 from dadosfera/beta

Beta

.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-lock.json

@@ -22,6 +22,7 @@
         "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",
         "reflect-metadata": "^0.1.13",
@@ -5232,6 +5233,14 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "node_modules/helmet": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz",
+      "integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/hexoid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
@@ -13620,6 +13629,11 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "helmet": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz",
+      "integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg=="
+    },
     "hexoid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",

package.json

@@ -34,6 +34,7 @@
     "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",
     "reflect-metadata": "^0.1.13",

src/main.ts

@@ -1,6 +1,7 @@
 import { NestFactory } from '@nestjs/core';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 import { writeFileSync } from 'fs';
+import helmet from 'helmet';
 
 import { AppModule } from './app.module';
 
@@ -14,6 +15,8 @@ async function bootstrap() {
     },
   });
 
+  app.use(helmet());
+
   const config = new DocumentBuilder()
     .setTitle('Maestro Grpc Documentation')
     .setDescription('Documentation for Maestro gateway')

src/modules/catalog/catalog.service.ts

@@ -245,7 +245,6 @@ class CatalogService {
     return data;
   }
 
-  
   async deleteTags(id, body) {
     const customer =
       body.info.customer.toLowerCase() === 'dadosfera'