FIX: Save

2026-08-31 19:58:21 +00:00 · 2022-11-08 11:41:34 -03:00
parent 602d81e51f bbdb023dde
commit b2f1ce669d
9 changed files with 92 additions and 107 deletions
@@ -26,9 +26,9 @@ jobs:
      - name: Extract Environment
        run: |
          if [ ${EVENT} == "workflow_dispatch" ]; then
-            echo "##[set-output name=environment;]$(echo ${DEPLOY_ENV})"
+            echo "environment=${DEPLOY_ENV}" >> $GITHUB_OUTPUT
          elif [ ${GITHUB_REF} == "refs/heads/main" ]; then
-            echo "##[set-output name=environment;]$(echo "prd")"
+            echo "environment=prd" >> $GITHUB_OUTPUT
          fi
        id: extract_environment

@@ -56,6 +56,19 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+  deploy-info:
+    if: ${{ github.event_name == 'workflow_dispatch'}}
+    needs: [extract_environment, semantic_release]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Create summary
+        env:
+          EVENT: ${{ github.event_name }}
+          IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
+          ENV: ${{ needs.extract_environment.outputs.environment }}
+        run: echo "### Deploy da branch \`$GITHUB_REF_NAME\` no ambiente **$ENV** :rocket:" >> $GITHUB_STEP_SUMMARY
+
  deploy:
    if: ${{ github.event_name == 'workflow_dispatch' || needs.semantic_release.outputs.new_release_published == 'true' }}
    needs: [extract_environment, semantic_release]
@@ -63,13 +76,6 @@ jobs:
      [self-hosted, '${{ needs.extract_environment.outputs.environment }}']

    steps:
-      - name: Printing stats
-        env:
-          EVENT: ${{ github.event_name }}
-          IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
-          ENV: ${{ needs.extract_environment.outputs.environment }}
-        run: echo ${GITHUB_REF#refs/heads/}
-
      - name: Checkout
        uses: actions/checkout@v2

@@ -90,7 +96,7 @@ jobs:
          python3 -m pip install awsebcli --upgrade

      - name: Configure AWS Region
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v1-node16
        id: aws
        with:
          aws-region: us-east-1
@@ -144,48 +150,36 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v2

-      - name: Extract Docs PageId
+      - name: Extract Docs BlockId and PageId 
        env:
          ENV: ${{ needs.extract_environment.outputs.environment }}
+          DEV_DOCS_BLOCK_ID: ${{ secrets.DEV_DOCS_BLOCK_ID }}
          DEV_DOCS_PAGE_ID: ${{ secrets.DEV_DOCS_PAGE_ID }}
+          STG_DOCS_BLOCK_ID: ${{ secrets.STG_DOCS_BLOCK_ID }}
          STG_DOCS_PAGE_ID: ${{ secrets.STG_DOCS_PAGE_ID }}
+          PRD_DOCS_BLOCK_ID: ${{ secrets.PRD_DOCS_BLOCK_ID }}
          PRD_DOCS_PAGE_ID: ${{ secrets.PRD_DOCS_PAGE_ID }}
        shell: bash
        run: |
          if [ $ENV == "dev" ]; then
-            echo "##[set-output name=result;]$(echo $DEV_DOCS_PAGE_ID)"
+            echo "block_id=$DEV_DOCS_BLOCK_ID" >> $GITHUB_OUTPUT
+            echo "page_id=$DEV_DOCS_PAGE_ID" >> $GITHUB_OUTPUT
          elif [ $ENV == "stg" ]; then
-            echo "##[set-output name=result;]$(echo $STG_DOCS_PAGE_ID)"
+            echo "block_id=$STG_DOCS_BLOCK_ID" >> $GITHUB_OUTPUT
+            echo "page_id=$STG_DOCS_PAGE_ID" >> $GITHUB_OUTPUT
          elif [ $ENV == "prd" ]; then
-            echo "##[set-output name=result;]$(echo $PRD_DOCS_PAGE_ID)"
+            echo "block_id=$PRD_DOCS_BLOCK_ID" >> $GITHUB_OUTPUT
+            echo "page_id=$PRD_DOCS_PAGE_ID" >> $GITHUB_OUTPUT
          fi
-        id: extract_docs_page_id
-
-      - name: Extract Docs BlockId
-        env:
-          ENV: ${{ needs.extract_environment.outputs.environment }}
-          DEV_DOCS_BLOCK_ID: ${{ secrets.DEV_DOCS_BLOCK_ID }}
-          STG_DOCS_BLOCK_ID: ${{ secrets.STG_DOCS_BLOCK_ID }}
-          PRD_DOCS_BLOCK_ID: ${{ secrets.PRD_DOCS_BLOCK_ID }}
-        shell: bash
-        run: |
-          if [ $ENV == "dev" ]; then
-            echo "##[set-output name=result;]$(echo $DEV_DOCS_BLOCK_ID)"
-          elif [ $ENV == "stg" ]; then
-            echo "##[set-output name=result;]$(echo $STG_DOCS_BLOCK_ID)"
-          elif [ $ENV == "prd" ]; then
-            echo "##[set-output name=result;]$(echo $PRD_DOCS_BLOCK_ID)"
-          fi
-        id: extract_docs_block_id
+        id: extract_docs_info

      - name: Generate API docs
        env:
          ENV: ${{ needs.extract_environment.outputs.environment }}
          DOCS_URL: ${{ secrets.DOCS_URL }}
          DOCS_API_TOKEN: ${{ secrets.DOCS_API_TOKEN }}
-          DOCS_PAGE_ID: ${{ steps.extract_docs_page_id.outputs.result }}
-          DOCS_BLOCK_ID: ${{ steps.extract_docs_block_id.outputs.result }}
-        continue-on-error: true
+          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 \
@@ -200,9 +194,3 @@ jobs:
          }
          EOF
          )
-      - name: Cleanup Docker's Leftovers
-        if: always()
-        continue-on-error: true
-        run: |
-          docker system prune
-          docker rmi -f $(docker images -aq)
@@ -12,7 +12,7 @@
      "dependencies": {
        "@aws-sdk/client-secrets-manager": "^3.112.0",
        "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
-        "@dadosfera/protospack-v2": "v3.19.0-beta.6",
+        "@dadosfera/protospack-v2": "3.19.0",
        "@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.0-beta.6",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.0-beta.6.tgz",
-      "integrity": "sha512-R1Kfn3QvBd/T9Dn3nnNjGupdW4s0bEVU8usoEi/eqPkNONDW/iX/OOeN8mYcMwEzlMG5r7iTpJK3ahCvdyc8kw==",
+      "version": "3.19.0",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.0.tgz",
+      "integrity": "sha512-TTBo0W+7pczlJyIu6BTbc0/XbrP9uQV5O8EeHdWpv/9yksc1lxLExPrB6LSozdg4etrJUYjNROH/voZEXs82Eg==",
      "dependencies": {
        "@grpc/grpc-js": "^1.6.7",
        "rxjs": "^7.5.5",
@@ -10338,9 +10338,9 @@
      }
    },
    "node_modules/ts-proto": {
-      "version": "1.126.1",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/ts-proto/-/ts-proto-1.126.1.tgz",
-      "integrity": "sha512-PKrcgd0mCQJDY7tp+th349uYhnjs2Tz7wSqm9+DBcodl3YCKPt1pFtFmApOZdQ8WlghhgKAuJDIRQJBd6jD5YA==",
+      "version": "1.131.0",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/ts-proto/-/ts-proto-1.131.0.tgz",
+      "integrity": "sha512-oj/kWrDz3JkkPQwumQDKfwHroH9iNz2alvrbCYzNYJlb/2MAUzFNfh9T+SZUPDfoXXK6oJoW1hGCHznj67yHNg==",
      "dependencies": {
        "@types/object-hash": "^1.3.0",
        "dataloader": "^1.4.0",
@@ -12307,9 +12307,9 @@
      }
    },
    "@dadosfera/protospack-v2": {
-      "version": "3.19.0-beta.6",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.0-beta.6.tgz",
-      "integrity": "sha512-R1Kfn3QvBd/T9Dn3nnNjGupdW4s0bEVU8usoEi/eqPkNONDW/iX/OOeN8mYcMwEzlMG5r7iTpJK3ahCvdyc8kw==",
+      "version": "3.19.0",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.19.0.tgz",
+      "integrity": "sha512-TTBo0W+7pczlJyIu6BTbc0/XbrP9uQV5O8EeHdWpv/9yksc1lxLExPrB6LSozdg4etrJUYjNROH/voZEXs82Eg==",
      "requires": {
        "@grpc/grpc-js": "^1.6.7",
        "rxjs": "^7.5.5",
@@ -18134,9 +18134,9 @@
      }
    },
    "ts-proto": {
-      "version": "1.126.1",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/ts-proto/-/ts-proto-1.126.1.tgz",
-      "integrity": "sha512-PKrcgd0mCQJDY7tp+th349uYhnjs2Tz7wSqm9+DBcodl3YCKPt1pFtFmApOZdQ8WlghhgKAuJDIRQJBd6jD5YA==",
+      "version": "1.131.0",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/ts-proto/-/ts-proto-1.131.0.tgz",
+      "integrity": "sha512-oj/kWrDz3JkkPQwumQDKfwHroH9iNz2alvrbCYzNYJlb/2MAUzFNfh9T+SZUPDfoXXK6oJoW1hGCHznj67yHNg==",
      "requires": {
        "@types/object-hash": "^1.3.0",
        "dataloader": "^1.4.0",
@@ -28,7 +28,7 @@
  "dependencies": {
    "@aws-sdk/client-secrets-manager": "^3.112.0",
    "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
-    "@dadosfera/protospack-v2": "v3.19.0-beta.6",
+    "@dadosfera/protospack-v2": "3.19.0",
    "@grpc/grpc-js": "^1.6.7",
    "@grpc/proto-loader": "^0.6.13",
    "@nestjs/common": "^8.4.7",
@@ -290,15 +290,15 @@ export const PERMISSIONS_GROUPS = {
        claim: 'GET /catalog',
        usage: PermissionUsages.PUBLIC,
        name: {
-          'pt-br': 'Buscar data assets',
-          'en-us': 'Search for data assets',
-          'es-es': 'Buscar data assets',
+          'pt-br': 'Acessar lista de Ativos e visualizar atributos',
+          'en-us': 'Access Assets list and its attributes',
+          'es-es': 'Acceda a la lista de Activos y vea los atributos',
        },
      },
      CREATE: {
        seqid: 19,
        claim: 'POST /catalog',
-        usage: PermissionUsages.PUBLIC,
+        usage: PermissionUsages.INTERNAL,
        name: {
          'pt-br': 'Criar atributos no catálogo',
          'en-us': 'Create attributes',
@@ -307,32 +307,33 @@ export const PERMISSIONS_GROUPS = {
      },
      UPDATE: {
        seqid: 25,
-        claim: 'PUT /catalog',
-        usage: PermissionUsages.INTERNAL,
+        claim: 'catalog:edit',
+        usage: PermissionUsages.PUBLIC,
        name: {
-          'pt-br': 'Editar atributos no catálogo',
-          'en-us': 'Edit attributes',
-          'es-es': 'Editar atributos',
+          'pt-br': 'Criar e editar atributos no catálogo',
+          'en-us': 'Create and edit attributes on the catalog',
+          'es-es': 'Crear y editar atributos en el catálogo',
        },
      },
      DELETE: {
        seqid: 1,
-        claim: 'DELETE /catalog',
-        usage: PermissionUsages.INTERNAL,
+        claim: 'catalog:delete',
+        usage: PermissionUsages.PUBLIC,
        name: {
-          'pt-br': 'Excluir atributos no catálogo',
-          'en-us': 'Remove attributes',
-          'es-es': 'Eliminar atributos',
+          'pt-br': 'Excluir Ativos do catálogo',
+          'en-us': 'Remove Assets from the catalog',
+          'es-es': 'Eliminar Activos del catálogo',
        },
      },
      DATA_MANAGER: {
        seqid: 42,
        claim: 'catalog:data_manager',
-        usage: PermissionUsages.PUBLIC,
+        usage: PermissionUsages.INTERNAL,
        name: {
-          'pt-br': 'Vizualizar todos os recursos do catálogo.',
-          'en-us': 'View all data assets.',
-          'es-es': 'Ver todos los activos de datos',
+          'pt-br':
+            'Gerente do catálogo. Consegue vizualizar e editar todos os ativos.',
+          'en-us': 'Catalog manager. Able to view and edit all assets.',
+          'es-es': 'Gestor de catálogos. Puede ver y editar todos los activos.',
        },
      },
    },
@@ -34,24 +34,30 @@ import {
  IUpdateDataRequest,
 } from './dtos';

+const catalogPermissions = PERMISSIONS_GROUPS.CATALOG.permissions;
@ApiTags('Catalog')
@Controller('catalog')
@Authenticated()
-@AuthenticateCondition((req, user) => {
-  if (req.path.includes('/manage_permissions/')) return true;
-  let action;
+@AuthenticateCondition((req, user: RequestUser) => {
+  if (user.permissions.includes(catalogPermissions.DATA_MANAGER.seqid))
+    return true;
+
+  if (req.path.includes('/manage-permissions')) return true;
+  let action: keyof typeof catalogPermissions;

  switch (req.method) {
    case 'POST':
-      action = 'CREATE';
-      break;
-
    case 'PUT':
      action = 'UPDATE';
      break;

+    case 'DELETE':
+      if (req.path.includes('/comment')) action = 'UPDATE';
+      else action = req.method;
+      break;
+
    default:
-      action = req.method;
+      action = req.method as 'GET';
  }

  return user.permissions.includes(
@@ -373,7 +379,7 @@ export class CatalogController {
    @Body('docs') docs: string,
  ) {
    const { user_id, customer_name } = user;
-    const [data_asset_type, id] = data_asset_id.split('-');
+    const [, id] = data_asset_id.split('-');

    this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
      user_id,
@@ -16,12 +16,12 @@ export class DucClient {
    transport: Transport.GRPC,
    options: {
      url: process.env.DUC_URL,
-      package: ProtoPackages.WritePackage,
+      package: [ProtoPackages.WritePackage, ProtoPackages.ReadPackage],
      credentials:
        process.env.LOCAL_ENV || process.env.ENV === 'local'
          ? undefined
          : credentials.createSsl(),
-      protoPath: ProtoPaths.WriteFilePath,
+      protoPath: [ProtoPaths.WriteFilePath, ProtoPaths.ReadFilePath],
      loader: {
        keepCase: true,
        enums: String,
@@ -155,7 +155,7 @@ export class PipelinesController {
      .then((res) => {
        //{pipeline:{tables: {tables: [], input_id: ''}}}
        let tables = JSON.parse(res.pipeline.config.tables);
-        if (tables?.tables) tables = tables?.tables;
+        if (tables?.tables) tables = tables.tables;
        Object.assign(res.pipeline, {
          transformations: res.pipeline.transformations
            ? JSON.parse(res.pipeline.transformations)
@@ -11,34 +11,19 @@ import {
 import { ApiTags } from '@nestjs/swagger';
 import { TransformationsClientService } from './client.service';
 import { IIdRequest } from './interfaces';
-import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
+import {
+  AuthenticateCondition,
+  Authenticated,
+  RequireSomePermission,
+} from 'src/authentication/authentication.decorator';
 import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
 import { TransformationsService } from './transformations.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { RequestUser, User } from 'src/authentication/user.decorator';
-
+const pipelinePermissions = PERMISSIONS_GROUPS.PIPELINE.permissions;
@ApiTags('Transformations')
@Controller('transformations')
-@AuthenticateCondition((req, user) => {
-  let action;
-
-  switch (req.method) {
-    case 'POST':
-      action = 'CREATE';
-      break;
-
-    case 'PUT':
-      action = 'UPDATE';
-      break;
-
-    default:
-      action = req.method;
-  }
-
-  return user.permissions.includes(
-    PERMISSIONS_GROUPS.TRANSFORMATIONS.permissions[action].seqid,
-  );
-})
+@Authenticated()
 export class TransformationsController {
  logger: DadosferaLogger;
  constructor(
@@ -50,6 +35,7 @@ export class TransformationsController {
  }

  @Post()
+  @RequireSomePermission(pipelinePermissions.CREATE, pipelinePermissions.UPDATE)
  async create(@Body() createTransformationDto) {
    this.logger.info(`/transformation - ON CREATE ROUTE`, {
      user: createTransformationDto.info.user_id,
@@ -67,6 +53,7 @@ export class TransformationsController {
  }

  @Get()
+  @RequireSomePermission(pipelinePermissions.GET)
  async findAll(@Body() data: IIdRequest) {
    this.logger.info(`/transformation - ON Find All ROUTE`, {
      user: data.info.user_id,
@@ -82,6 +69,7 @@ export class TransformationsController {
  }

  @Get('/:id')
+  @RequireSomePermission(pipelinePermissions.GET)
  async findOne(@Body() data, @Param() params) {
    const { id } = params;
    this.logger.info(`/transformation/${id} - ON Find One ROUTE`, {
@@ -98,6 +86,7 @@ export class TransformationsController {
  }

  @Put(':id')
+  @RequireSomePermission(pipelinePermissions.CREATE, pipelinePermissions.UPDATE)
  async update(
    @User() user: RequestUser,
    @Body() updateTransformationDto,
@@ -120,6 +109,7 @@ export class TransformationsController {
  }

  @Delete(':id')
+  @RequireSomePermission(pipelinePermissions.CREATE, pipelinePermissions.UPDATE)
  async delete(@Body() data, @Param() params) {
    const { id } = params;
    this.logger.info(`/transformation/${id} - ON DELETE ROUTE`, {