Merge pull request #170 from dadosfera/fix/revert-action-version

FIX: return semantic release action to previous version

.github/workflows/deploy-manually.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       environment:
-        description: 'Deployment environment'
+        description: "Deployment environment"
         required: true
         type: choice
         options:
@@ -39,7 +39,7 @@ jobs:
       new_release_version: ${{ (steps.semantic.outputs.new_release_published == 'true' && steps.semantic.outputs.new_release_version) || (github.event_name == 'workflow_dispatch' && '0.0.0') }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - if: github.event_name != 'workflow_dispatch'
         name: Semantic Release
@@ -73,7 +73,7 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' || needs.semantic_release.outputs.new_release_published == 'true' }}
     needs: [extract_environment, semantic_release]
     runs-on:
-      [self-hosted, '${{ needs.extract_environment.outputs.environment }}']
+      [self-hosted, "${{ needs.extract_environment.outputs.environment }}"]
 
     steps:
       - name: Checkout
@@ -145,12 +145,12 @@ jobs:
   api_docs:
     needs: [extract_environment, semantic_release, deploy]
     runs-on:
-      [self-hosted, '${{ needs.extract_environment.outputs.environment }}']
+      [self-hosted, "${{ needs.extract_environment.outputs.environment }}"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Extract Docs BlockId and PageId 
+      - name: Extract Docs BlockId and PageId
         env:
           ENV: ${{ needs.extract_environment.outputs.environment }}
           DEV_DOCS_BLOCK_ID: ${{ secrets.DEV_DOCS_BLOCK_ID }}
@@ -181,16 +181,7 @@ jobs:
           DOCS_PAGE_ID: ${{ steps.extract_docs_info.outputs.page_id }}
           DOCS_BLOCK_ID: ${{ steps.extract_docs_info.outputs.block_id }}
         run: |
-          SWAGGER=`cat swagger.txt`
-          curl --request POST \
-            --url $DOCS_URL \
-            --header 'Content-Type: application/json' \
-            --data @<(cat <<EOF
-            {
-            "service": "$DOCS_API_TOKEN",
-            "pageId": "$DOCS_PAGE_ID",
-            "blockId": "$DOCS_BLOCK_ID",
-            "schema":  $SWAGGER
-          }
-          EOF
-          )
+          sed -i -e "s/\${DOCS_API_TOKEN}/$DOCS_API_TOKEN/g" docsfera.json
+          sed -i -e "s/\${DOCS_PAGE_ID}/$DOCS_PAGE_ID/g" docsfera.json
+          sed -i -e "s/\${DOCS_BLOCK_ID}/$DOCS_BLOCK_ID/g" docsfera.json
+          curl -X POST -H 'Content-Type: application/json' -d @docsfera.json $DOCS_URL

package-lock.json

@@ -12,7 +12,7 @@
       "dependencies": {
         "@aws-sdk/client-secrets-manager": "^3.112.0",
         "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
-        "@dadosfera/protospack-v2": "3.19.1",
+        "@dadosfera/protospack-v2": "3.19.2",
         "@grpc/grpc-js": "^1.6.7",
         "@grpc/proto-loader": "^0.6.13",
         "@nestjs/common": "^8.4.7",
@@ -1726,9 +1726,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.19.1",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.1.tgz",
-      "integrity": "sha512-8YCyyc9Jpls31mXGdsw6IksZc6BGgNNm2Ht85rtapZfhGowOIXkjfXLlWFy7WxfMl0AQYH3pV3u4/WO7rR/JPA==",
+      "version": "3.19.2",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.2.tgz",
+      "integrity": "sha512-0+5V4zo7x36Y9xojYnktTllm41uhAttEFTT13i2sBXn4Cb6xSCX5rOyMHwRHb4TOHTpWvaO58lGjP/i0x+lpEg==",
       "dependencies": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",
@@ -12307,9 +12307,9 @@
       }
     },
     "@dadosfera/protospack-v2": {
-      "version": "3.19.1",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.1.tgz",
-      "integrity": "sha512-8YCyyc9Jpls31mXGdsw6IksZc6BGgNNm2Ht85rtapZfhGowOIXkjfXLlWFy7WxfMl0AQYH3pV3u4/WO7rR/JPA==",
+      "version": "3.19.2",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.2.tgz",
+      "integrity": "sha512-0+5V4zo7x36Y9xojYnktTllm41uhAttEFTT13i2sBXn4Cb6xSCX5rOyMHwRHb4TOHTpWvaO58lGjP/i0x+lpEg==",
       "requires": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",

package.json

@@ -28,7 +28,7 @@
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.112.0",
     "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
-    "@dadosfera/protospack-v2": "3.19.1",
+    "@dadosfera/protospack-v2": "3.19.2",
     "@grpc/grpc-js": "^1.6.7",
     "@grpc/proto-loader": "^0.6.13",
     "@nestjs/common": "^8.4.7",

src/main.ts

@@ -6,6 +6,8 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 
 import { AppModule } from './app.module';
 import { writeFileSync } from 'fs';
+import { execSync } from 'child_process';
+import { INestApplication } from '@nestjs/common';
 async function bootstrap() {
   DadosferaLogger.setupLogger({
     serviceName: 'maestro',
@@ -24,26 +26,53 @@ async function bootstrap() {
   });
 
   app.use(helmet());
+  configureSwagger(app);
 
+  await app.listen(3333);
+}
+function configureSwagger(app: INestApplication) {
   const date = new Date();
+  const swaggerVersion = `${date.getDate()}.${
+    date.getMonth() + 1
+  }.${date.getFullYear()} - ${date.getHours()}:${date.getMinutes()}`;
+
+  let branchName = '';
+  try {
+    branchName = execSync('git rev-parse --abbrev-ref HEAD')
+      .toString()
+      .replace('\n', '')
+      .trim();
+  } catch (error) {
+    console.log("Can't get branch name", error);
+  }
+  const swaggerTitle = branchName ? `Maestro - ${branchName}` : 'Maestro';
 
   const config = new DocumentBuilder()
-    .setTitle('Maestro')
+    .setTitle(swaggerTitle)
     .setDescription('Documentation for Maestro gateway')
-    .setVersion(
-      `${date.getDate()}.${
-        date.getMonth() + 1
-      }.${date.getFullYear()} - ${date.getHours()}:${date.getMinutes()}`,
+    .setVersion(swaggerVersion)
+    .addBearerAuth(
+      { type: 'http', scheme: 'bearer', bearerFormat: 'JWT' },
+      'Authorization',
     )
-    .addBearerAuth()
     .build();
 
   const document = SwaggerModule.createDocument(app, config);
 
   if (process.env.ENV === 'local') SwaggerModule.setup('api', app, document);
 
-  await writeFileSync('swagger.txt', JSON.stringify(JSON.stringify(document)));
-
-  await app.listen(3333);
+  writeFileSync(
+    'docsfera.json',
+    JSON.stringify(
+      {
+        service: '${DOCS_API_TOKEN}',
+        pageId: '${DOCS_PAGE_ID}',
+        blockId: '${DOCS_BLOCK_ID}',
+        schema: document,
+      },
+      null,
+      2,
+    ),
+  );
 }
 bootstrap();