diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f71d05..4193f15 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,30 +11,18 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Docker Compose - run: | - python3 -m pip install docker-compose --upgrade - - name: Build env: - ENV: test - IMAGE_TAG: test + APP_NAME: ${{ github.event.repository.name }} run: | - export ENV=test - export IMAGE_TAG=test - export ACCOUNT_ID=test - docker-compose -f build.docker-compose.yml build + docker build -t $APP_NAME --target test . - name: Run Test env: ENV: test - IMAGE_TAG: test - ACCOUNT_ID: test APP_NAME: ${{ github.event.repository.name }} run: | - export ENV=test - export IMAGE_TAG=test - docker-compose -f build.docker-compose.yml run --rm --entrypoint="npm run test" $APP_NAME + docker run --rm --entrypoint="npm" $APP_NAME run test - name: Remove Docker's Trash if: always() diff --git a/Dockerfile b/Dockerfile index ba242b6..2f70641 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,21 @@ +# install all dependencies FROM node:18.3.0-alpine3.15 as packages -WORKDIR /packages -COPY package.json . -COPY package-lock.json . -RUN apk update \ - && apk add --no-cache aws-cli \ - && aws codeartifact login --tool npm --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1 \ +WORKDIR /app +COPY package.json package-lock.json ./ +RUN apk add --no-cache aws-cli \ + && aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1 \ && npm install +# unit test specific build +FROM node:18.3.0-alpine3.15 as test +WORKDIR /app +COPY --from=packages /app/node_modules ./node_modules +COPY . ./ + FROM node:18.3.0-alpine3.15 WORKDIR /app COPY . /app/ -COPY --from=packages /packages/node_modules /app/node_modules +COPY --from=packages /app/node_modules ./node_modules RUN npm run build EXPOSE 3333 ENTRYPOINT npm run start diff --git a/package-lock.json b/package-lock.json index e3f1384..0e10446 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "UNLICENSED", "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", + "@dadosfera/dadosfera-logs": "^1.0.0-beta.3", "@dadosfera/protospack-v2": "3.10.3", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", @@ -26,7 +27,6 @@ "class-transformer": "^0.5.1", "class-validator": "^0.13.2", "cron-parser": "^4.4.0", - "dadosfera-logs": "^1.0.0-alpha.10", "dotenv": "^14.3.2", "elastic-apm-node": "^3.36.0", "helmet": "^5.1.0", @@ -1706,6 +1706,16 @@ "kuler": "^2.0.0" } }, + "node_modules/@dadosfera/dadosfera-logs": { + "version": "1.0.0-beta.3", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/dadosfera-logs/-/dadosfera-logs-1.0.0-beta.3.tgz", + "integrity": "sha512-VuGiQlpDulcl1+FSFoT4/6PA9Pr+DAzbFHAYesz9rPinR46ejG7ZBZk3m86NYqQtgMyurqXvgCR8GPy9FpwqFw==", + "dependencies": { + "@elastic/ecs-winston-format": "^1.3.1", + "winston": "^3.7.2", + "winston-log2gelf": "^2.4.0" + } + }, "node_modules/@dadosfera/protospack-v2": { "version": "3.10.3", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.10.3.tgz", @@ -4566,16 +4576,6 @@ "dev": true, "license": "MIT" }, - "node_modules/dadosfera-logs": { - "version": "1.0.0-alpha.10", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/dadosfera-logs/-/dadosfera-logs-1.0.0-alpha.10.tgz", - "integrity": "sha512-OZ5sAkELiEQrViSvHjxM/Vb/skiXnkimNfgExdKPrHuVfy2s46d47p0QkL5XabFCvjEGyRKUCK8+UL/kRsKnnw==", - "dependencies": { - "@elastic/ecs-winston-format": "^1.3.1", - "winston": "^3.7.2", - "winston-log2gelf": "^2.4.0" - } - }, "node_modules/data-urls": { "version": "2.0.0", "dev": true, @@ -12250,6 +12250,16 @@ "kuler": "^2.0.0" } }, + "@dadosfera/dadosfera-logs": { + "version": "1.0.0-beta.3", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/dadosfera-logs/-/dadosfera-logs-1.0.0-beta.3.tgz", + "integrity": "sha512-VuGiQlpDulcl1+FSFoT4/6PA9Pr+DAzbFHAYesz9rPinR46ejG7ZBZk3m86NYqQtgMyurqXvgCR8GPy9FpwqFw==", + "requires": { + "@elastic/ecs-winston-format": "^1.3.1", + "winston": "^3.7.2", + "winston-log2gelf": "^2.4.0" + } + }, "@dadosfera/protospack-v2": { "version": "3.10.3", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.10.3.tgz", @@ -14227,16 +14237,6 @@ } } }, - "dadosfera-logs": { - "version": "1.0.0-alpha.10", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/dadosfera-logs/-/dadosfera-logs-1.0.0-alpha.10.tgz", - "integrity": "sha512-OZ5sAkELiEQrViSvHjxM/Vb/skiXnkimNfgExdKPrHuVfy2s46d47p0QkL5XabFCvjEGyRKUCK8+UL/kRsKnnw==", - "requires": { - "@elastic/ecs-winston-format": "^1.3.1", - "winston": "^3.7.2", - "winston-log2gelf": "^2.4.0" - } - }, "data-urls": { "version": "2.0.0", "dev": true, diff --git a/package.json b/package.json index 07ed7a0..1c70254 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "class-transformer": "^0.5.1", "class-validator": "^0.13.2", "cron-parser": "^4.4.0", - "dadosfera-logs": "^1.0.0-alpha.10", + "@dadosfera/dadosfera-logs": "^1.0.0-beta.3", "dotenv": "^14.3.2", "elastic-apm-node": "^3.36.0", "helmet": "^5.1.0", diff --git a/src/app.module.ts b/src/app.module.ts index 3de9691..23c5879 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -40,7 +40,7 @@ import { ConnectorModule } from './modules/connector/connector.module'; import { AuthModule } from './modules/auth/auth.module'; import { PermissionsModule } from './modules/permissions/permissions.module'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { TermsOfUseModule } from './modules/termsOfUse/termsOfUse.module'; import { ConnectionModule } from './modules/connection/connection.module'; import { ConnectionTestModule } from './modules/connection-test/connection-test.module'; diff --git a/src/authentication/authentication.guard.spec.ts b/src/authentication/authentication.guard.spec.ts index 6ee76d0..29c6a5f 100644 --- a/src/authentication/authentication.guard.spec.ts +++ b/src/authentication/authentication.guard.spec.ts @@ -5,7 +5,7 @@ import { APP_GUARD } from '@nestjs/core'; import jwt from 'jsonwebtoken'; import { Body, Controller, Get } from '@nestjs/common'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { AuthenticateCondition, Authenticated, diff --git a/src/authentication/authentication.guard.ts b/src/authentication/authentication.guard.ts index 3fca4da..44b3a75 100644 --- a/src/authentication/authentication.guard.ts +++ b/src/authentication/authentication.guard.ts @@ -8,7 +8,7 @@ import { import { Reflector } from '@nestjs/core'; import assert from 'assert'; import jwt from 'jsonwebtoken'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { AuthClientService } from '../modules/auth/auth.service'; import { AuthenticationFunction, @@ -22,7 +22,7 @@ import ErrorCodes from '../utils/errorCodes'; export class AuthenticationGuard implements CanActivate, OnApplicationBootstrap { - logger: any; + logger: DadosferaLogger; pems: Map; diff --git a/src/authentication/permissions.enum.ts b/src/authentication/permissions.enum.ts index cc7d4be..f2e73ea 100644 --- a/src/authentication/permissions.enum.ts +++ b/src/authentication/permissions.enum.ts @@ -58,8 +58,8 @@ export const PERMISSIONS = { PIPELINE: { title: { - 'pt-br': 'Pipelines', - 'en-us': 'Pipelines', + 'pt-br': 'Coletar | Pipelines', + 'en-us': 'Collect | Pipelines', }, permissions: { CREATE: { @@ -94,7 +94,7 @@ export const PERMISSIONS = { claim: 'DELETE /pipelines', usage: PermissionUsages.PUBLIC, name: { - 'pt-br': 'Remover pipeline', + 'pt-br': 'Excluir pipeline', 'en-us': 'Delete pipeline', }, }, @@ -103,14 +103,14 @@ export const PERMISSIONS = { INPUT: { title: { - 'pt-br': 'Conexões', - 'en-us': 'Connections', + 'pt-br': 'Coletar | Conexões', + 'en-us': 'Collect | Connections', }, permissions: { CREATE: { seqid: 21, claim: 'POST /inputs', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': 'Criar conexões', 'en-us': 'Create connections', @@ -119,7 +119,7 @@ export const PERMISSIONS = { GET: { seqid: 9, claim: 'GET /inputs', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': 'Buscar conexões', 'en-us': 'Get connections', @@ -128,7 +128,7 @@ export const PERMISSIONS = { UPDATE: { seqid: 27, claim: 'PUT /inputs', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': 'Atualizar conexões', 'en-us': 'Create connections', @@ -137,18 +137,18 @@ export const PERMISSIONS = { DELETE: { seqid: 3, claim: 'DELETE /inputs', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Remover conexões', + 'pt-br': 'Excluir conexões', 'en-us': 'Delete connections', }, }, GET_ENTITIES: { seqid: 10, claim: 'GET /inputs/available-entities', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Remover conexões', + 'pt-br': 'Excluir conexões', 'en-us': 'Delete connections', }, }, @@ -193,7 +193,7 @@ export const PERMISSIONS = { claim: 'DELETE /outputs', usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Remover outputs', + 'pt-br': 'Excluir outputs', 'en-us': 'Remove outputs', }, }, @@ -209,7 +209,7 @@ export const PERMISSIONS = { CREATE: { seqid: 24, claim: 'POST /transformations', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': 'Criar micro-transformações', 'en-us': 'Create micro-transformations', @@ -218,7 +218,7 @@ export const PERMISSIONS = { GET: { seqid: 15, claim: 'GET /transformations', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': 'Buscar micro-transformações', 'en-us': 'Get micro-transformations', @@ -227,7 +227,7 @@ export const PERMISSIONS = { UPDATE: { seqid: 30, claim: 'PUT /transformations', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': 'Editar micro-transformações', 'en-us': 'Edit micro-transformations', @@ -236,9 +236,9 @@ export const PERMISSIONS = { DELETE: { seqid: 6, claim: 'DELETE /transformations', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Remover micro-transformações', + 'pt-br': 'Excluir micro-transformações', 'en-us': 'Remove micro-transformations', }, }, @@ -247,44 +247,44 @@ export const PERMISSIONS = { CATALOG: { title: { - 'pt-br': 'Catálogo', - 'en-us': 'Catalog', + 'pt-br': 'Explorar | Catálogo', + 'en-us': 'Explore | Catalog', }, permissions: { + GET: { + seqid: 7, + claim: 'GET /catalog', + usage: PermissionUsages.PUBLIC, + name: { + 'pt-br': 'Buscar data assets', + 'en-us': 'Search for data assets', + }, + }, CREATE: { seqid: 19, claim: 'POST /catalog', usage: PermissionUsages.PUBLIC, name: { 'pt-br': 'Criar atributos no catálogo', - 'en-us': 'Create catalog attributes', - }, - }, - GET: { - seqid: 7, - claim: 'GET /catalog', - usage: PermissionUsages.PUBLIC, - name: { - 'pt-br': 'Buscar catálogos', - 'en-us': 'Get catalogs', + 'en-us': 'Create attributes', }, }, UPDATE: { seqid: 25, claim: 'PUT /catalog', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Editar catálogo', - 'en-us': 'Edit catalogs', + 'pt-br': 'Editar atributos no catálogo', + 'en-us': 'Edit attributes', }, }, DELETE: { seqid: 1, claim: 'DELETE /catalog', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Remover catálogo', - 'en-us': 'Remove catalogs', + 'pt-br': 'Excluir atributos no catálogo', + 'en-us': 'Remove attributes', }, }, }, @@ -328,7 +328,7 @@ export const PERMISSIONS = { claim: 'DELETE /connectors', usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Remover conectores', + 'pt-br': 'Excluir conectores', 'en-us': 'Remove connectors', }, }, @@ -337,8 +337,8 @@ export const PERMISSIONS = { SNOWFLAKE: { title: { - 'pt-br': 'Snowflake', - 'en-us': 'Snowflake', + 'pt-br': 'Explorar | Consolidar', + 'en-us': 'Explore | Data consolidation', }, permissions: { OPEN: { @@ -373,14 +373,14 @@ export const PERMISSIONS = { METABASE: { title: { - 'pt-br': 'Metabase', - 'en-us': 'Metabase', + 'pt-br': 'Analisar | Visualização', + 'en-us': 'Analyze | Visualization', }, permissions: { OPEN: { seqid: 11, claim: 'GET /metabase', - usage: PermissionUsages.INTERNAL, + usage: PermissionUsages.PUBLIC, name: { 'pt-br': 'Acessar Metabase', 'en-us': 'Access Metabase', @@ -391,23 +391,23 @@ export const PERMISSIONS = { ORCHEST: { title: { - 'pt-br': 'Orchest', - 'en-us': 'Orchest', + 'pt-br': 'Analisar | Inteligência', + 'en-us': 'Analyze | Intelligence', }, permissions: { INTELLIGENCE: { seqid: 31, claim: 'intelligence:open', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { - 'pt-br': 'Acessar inteligência', - 'en-us': 'Access intelligence', + 'pt-br': 'Acessar Orchest', + 'en-us': 'Access Orchest', }, }, APP_BUILDER: { seqid: 32, claim: 'app-builder:open', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': 'Acessar App Builder', 'en-us': 'Access App Builder', @@ -416,7 +416,7 @@ export const PERMISSIONS = { MACHINE_LEARNING: { seqid: 33, claim: 'machine-learning:open', - usage: PermissionUsages.PUBLIC, + usage: PermissionUsages.INTERNAL, name: { 'pt-br': 'Acessar Machine Learning', 'en-us': 'Access Machine Learning', @@ -435,7 +435,7 @@ export const PERMISSIONS = { claim: 'users:admin', usage: PermissionUsages.PUBLIC, name: { - 'pt-br': 'Administrar usuários e grupos', + 'pt-br': 'Gestão de usuários e grupos', 'en-us': 'Manage user and roles', }, }, diff --git a/src/authentication/user.decorator.spec.ts b/src/authentication/user.decorator.spec.ts index 9af2ebd..8e844f2 100644 --- a/src/authentication/user.decorator.spec.ts +++ b/src/authentication/user.decorator.spec.ts @@ -5,7 +5,7 @@ import { APP_GUARD } from '@nestjs/core'; import jwt from 'jsonwebtoken'; import { Controller, Get } from '@nestjs/common'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { AuthenticationGuard } from './authentication.guard'; import { AuthClientService } from '../modules/auth/auth.service'; diff --git a/src/clients/inputs/client.service.ts b/src/clients/inputs/client.service.ts index 0f4c94c..c6da694 100644 --- a/src/clients/inputs/client.service.ts +++ b/src/clients/inputs/client.service.ts @@ -24,14 +24,14 @@ import { objectSnakeToCamel, } from 'src/utils/CaseConverter'; import { mustache } from 'src/utils/mustache'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { OauthSecrets } from 'src/utils/OauthSecrets'; import { URLSearchParams } from 'url'; import { IIdRequest, UpdateInputRequest } from './interfaces'; export class InputsClientService implements OnModuleInit { private inputService: InputService; - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/clients/outputs/client.service.ts b/src/clients/outputs/client.service.ts index abfa662..71fbccb 100644 --- a/src/clients/outputs/client.service.ts +++ b/src/clients/outputs/client.service.ts @@ -1,6 +1,6 @@ import { Controller, Inject, OnModuleInit } from '@nestjs/common'; import { ClientGrpc, Payload } from '@nestjs/microservices'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { OutputServicesNames, OutputsServiceInterface } from 'protospack'; import { objectCamelToSnake, @@ -15,7 +15,7 @@ import { @Controller('output') export class OutputsClientService implements OnModuleInit { private outputService: OutputsServiceInterface; - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/clients/pipelines/client.service.ts b/src/clients/pipelines/client.service.ts index 829462b..e0631d9 100644 --- a/src/clients/pipelines/client.service.ts +++ b/src/clients/pipelines/client.service.ts @@ -17,11 +17,11 @@ import { IIdRequest, IUpdatePipelineRequest, } from './interfaces'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; export class PipelinesClientService implements OnModuleInit { private pipelineService: PipelinesServiceInterface; - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/clients/transformations/client.service.ts b/src/clients/transformations/client.service.ts index ea00f88..8f70965 100644 --- a/src/clients/transformations/client.service.ts +++ b/src/clients/transformations/client.service.ts @@ -1,7 +1,7 @@ import { Controller, Inject, OnModuleInit, Post } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; import { TransformationsServiceInterface } from 'protospack'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { objectCamelToSnake, objectSnakeToCamel, @@ -11,7 +11,7 @@ import { ICreateTransformationsRequest, IIdRequest } from './interfaces'; @Controller('transformation') export class TransformationsClientService implements OnModuleInit { private transformationService: TransformationsServiceInterface; - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/main.ts b/src/main.ts index add8d4c..4ae9097 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,7 +2,7 @@ if (process.env.ENV !== 'local') require('elastic-apm-node/start'); import { NestFactory } from '@nestjs/core'; import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; import helmet from 'helmet'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import documentEmpty from '../swagger_empty.json'; @@ -12,21 +12,10 @@ async function bootstrap() { serviceName: 'maestro', serviceEnvironment: process.env.ENV, }); - const logger = new DadosferaLogger().logger; - - const orginalWinstonLog = logger.log.bind(logger); - logger.log = function (...kwargs: any[]) { - if (kwargs[0] in logger.levels) { - if (kwargs[0] == 'error') { - orginalWinstonLog('error', kwargs[2]); - } - } else { - orginalWinstonLog('info', ...kwargs); - } - }; + const logger = new DadosferaLogger(); const app = await NestFactory.create(AppModule, { - logger: logger, + logger, cors: { origin: '*', methods: 'GET,HEAD,PUT,PATCH,POST,DELETE', diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index 2e4b54c..e664c96 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -22,14 +22,14 @@ import { } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages'; import { AuthClientService } from './auth.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter'; @ApiTags('Auth') @UseFilters(new GrpcToHttpExceptionFilter()) @Controller('auth') export class AuthController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) diff --git a/src/modules/auth/auth.module.ts b/src/modules/auth/auth.module.ts index 65d6b34..88b2dda 100644 --- a/src/modules/auth/auth.module.ts +++ b/src/modules/auth/auth.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { ClientsModule } from '@nestjs/microservices'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { AuthController } from './auth.controller'; import { AuthClientService } from './auth.service'; diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts index de998f9..0da58eb 100644 --- a/src/modules/auth/auth.service.ts +++ b/src/modules/auth/auth.service.ts @@ -1,6 +1,6 @@ import { OnModuleInit, Inject, Injectable } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { lastValueFrom } from 'rxjs'; import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; @@ -20,7 +20,7 @@ import { @Injectable() export class AuthClientService implements OnModuleInit { - logger: any; + logger: DadosferaLogger; private authService: AuthServiceInterface; constructor( diff --git a/src/modules/catalog/catalog.controller.ts b/src/modules/catalog/catalog.controller.ts index b627f73..bb7cb84 100644 --- a/src/modules/catalog/catalog.controller.ts +++ b/src/modules/catalog/catalog.controller.ts @@ -12,7 +12,7 @@ import { ApiTags } from '@nestjs/swagger'; import { AuthenticateCondition } from '../../authentication/authentication.decorator'; import { PERMISSIONS } from '../../authentication/permissions.enum'; import { CatalogService } from './catalog.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; @ApiTags('Catalog') @Controller('catalog') @@ -37,7 +37,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; ); }) export class CatalogController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/connection-test/connection-test.controller.spec.ts b/src/modules/connection-test/connection-test.controller.spec.ts index fa88dfe..6744a3b 100644 --- a/src/modules/connection-test/connection-test.controller.spec.ts +++ b/src/modules/connection-test/connection-test.controller.spec.ts @@ -1,7 +1,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { ConnectionTestController } from './connection-test.controller'; import { ConnectionTestService } from './connection-test.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { ConnectionTestClientConfiguration } from './connection-test-client.config'; import { ClientsModule } from '@nestjs/microservices'; diff --git a/src/modules/connection-test/connection-test.controller.ts b/src/modules/connection-test/connection-test.controller.ts index f78309f..d787fe1 100644 --- a/src/modules/connection-test/connection-test.controller.ts +++ b/src/modules/connection-test/connection-test.controller.ts @@ -23,7 +23,7 @@ import { GetTableMetadataRes, GetTableMetadataReq, } from './dto/connection-test'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { Authenticated } from 'src/authentication/authentication.decorator'; import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; diff --git a/src/modules/connection-test/connection-test.module.ts b/src/modules/connection-test/connection-test.module.ts index 42faaa5..1eb4099 100644 --- a/src/modules/connection-test/connection-test.module.ts +++ b/src/modules/connection-test/connection-test.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { ConnectionTestController } from './connection-test.controller'; import { ConnectionTestService } from './connection-test.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { ClientsModule } from '@nestjs/microservices'; import { ConnectionTestClientConfiguration } from './connection-test-client.config'; import { ConnectionModule } from '../connection/connection.module'; diff --git a/src/modules/connection-test/connection-test.service.spec.ts b/src/modules/connection-test/connection-test.service.spec.ts index 39c1448..3550ffc 100644 --- a/src/modules/connection-test/connection-test.service.spec.ts +++ b/src/modules/connection-test/connection-test.service.spec.ts @@ -1,7 +1,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { ConnectionTestController } from './connection-test.controller'; import { ConnectionTestService } from './connection-test.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { ConnectionTestClientConfiguration } from './connection-test-client.config'; import { ClientsModule } from '@nestjs/microservices'; diff --git a/src/modules/connection/connection.controller.ts b/src/modules/connection/connection.controller.ts index 39ffc65..844bfd5 100644 --- a/src/modules/connection/connection.controller.ts +++ b/src/modules/connection/connection.controller.ts @@ -13,7 +13,7 @@ import { import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { ConnectionClientService } from './client.service'; import { CreateConnectionDto } from './dtos/create-connection'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { Authenticated, RequireAllPermissions, diff --git a/src/modules/connection/connection.module.ts b/src/modules/connection/connection.module.ts index 3ce6485..086b72c 100644 --- a/src/modules/connection/connection.module.ts +++ b/src/modules/connection/connection.module.ts @@ -3,7 +3,7 @@ import { ClientsModule } from '@nestjs/microservices'; import { ConnectionClientService } from './client.service'; import { ConnectionClientConfiguration } from './client.config'; import { ConnectionController } from './connection.controller'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; const client = new ConnectionClientConfiguration(); diff --git a/src/modules/connector/connector.controller.ts b/src/modules/connector/connector.controller.ts index 230f3b4..5529d1a 100644 --- a/src/modules/connector/connector.controller.ts +++ b/src/modules/connector/connector.controller.ts @@ -24,7 +24,7 @@ import { DeleteConnectorDto } from './dtos/delete-connector'; import { GetAllDto } from './dtos/get-all'; import { RemoveTagDto } from './dtos/remove-tag'; import { UpdateDto } from './dtos/update'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { Authenticated, RequireAllPermissions, @@ -36,7 +36,7 @@ import { PERMISSIONS } from 'src/authentication/permissions.enum'; @Authenticated() @Controller('connectors') export class ConnectorController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/connector/connector.module.ts b/src/modules/connector/connector.module.ts index 417380b..d30e59a 100644 --- a/src/modules/connector/connector.module.ts +++ b/src/modules/connector/connector.module.ts @@ -3,7 +3,7 @@ import { ClientsModule } from '@nestjs/microservices'; import { ConnectorClientService } from './client.service'; import { ConnectorClientConfiguration } from './client.config'; import { ConnectorController } from './connector.controller'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; const connectorClient = new ConnectorClientConfiguration(); diff --git a/src/modules/health/health.controller.ts b/src/modules/health/health.controller.ts index 073626f..67f5ffa 100644 --- a/src/modules/health/health.controller.ts +++ b/src/modules/health/health.controller.ts @@ -1,12 +1,12 @@ import { Controller, Get, Inject } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; import { HealthService } from './health.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; @ApiTags('Health') @Controller('health') export class HealthController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/health/health.service.ts b/src/modules/health/health.service.ts index 906981d..3934985 100644 --- a/src/modules/health/health.service.ts +++ b/src/modules/health/health.service.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; @Injectable() export class HealthService { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/inputs/inputs.controller.ts b/src/modules/inputs/inputs.controller.ts index ce2ed85..c464b9d 100644 --- a/src/modules/inputs/inputs.controller.ts +++ b/src/modules/inputs/inputs.controller.ts @@ -9,7 +9,7 @@ import { Post, } from '@nestjs/common'; import { InputsService } from './inputs.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { InputsClientService } from 'src/clients/inputs/client.service'; import { UpdateInputRequest } from 'src/clients/inputs/interfaces'; import { PERMISSIONS } from '../../authentication/permissions.enum'; @@ -59,7 +59,7 @@ import { }) export class InputsController { inputService: InputsService; - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/network-config/network-config.controller.spec.ts b/src/modules/network-config/network-config.controller.spec.ts index b54db8e..dcd7825 100644 --- a/src/modules/network-config/network-config.controller.spec.ts +++ b/src/modules/network-config/network-config.controller.spec.ts @@ -3,7 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { NetworkConfigClientConfiguration } from './network-config-client.config'; import { NetworkConfigController } from './network-config.controller'; import { NetworkConfigService } from './network-config.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; describe('NetworkConfigController', () => { let controller: NetworkConfigController; diff --git a/src/modules/network-config/network-config.controller.ts b/src/modules/network-config/network-config.controller.ts index 1d489b2..7547ae3 100644 --- a/src/modules/network-config/network-config.controller.ts +++ b/src/modules/network-config/network-config.controller.ts @@ -11,7 +11,7 @@ import { Query, } from '@nestjs/common'; import { NetworkConfigService } from './network-config.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { ApiOkResponse, ApiTags } from '@nestjs/swagger'; import { RequestUser, User } from 'src/authentication/user.decorator'; import { diff --git a/src/modules/network-config/network-config.module.ts b/src/modules/network-config/network-config.module.ts index acd8a89..1e701d0 100644 --- a/src/modules/network-config/network-config.module.ts +++ b/src/modules/network-config/network-config.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { NetworkConfigController } from './network-config.controller'; import { NetworkConfigService } from './network-config.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { ClientsModule } from '@nestjs/microservices'; import { NetworkConfigClientConfiguration } from './network-config-client.config'; const client = new NetworkConfigClientConfiguration(); diff --git a/src/modules/network-config/network-config.service.spec.ts b/src/modules/network-config/network-config.service.spec.ts index 1d71b2b..a2390e6 100644 --- a/src/modules/network-config/network-config.service.spec.ts +++ b/src/modules/network-config/network-config.service.spec.ts @@ -3,7 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { NetworkConfigClientConfiguration } from './network-config-client.config'; import { NetworkConfigController } from './network-config.controller'; import { NetworkConfigService } from './network-config.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; describe('NetworkConfigService', () => { let service: NetworkConfigService; diff --git a/src/modules/outputs/outputs.controllers.ts b/src/modules/outputs/outputs.controllers.ts index 45b07f1..588417f 100644 --- a/src/modules/outputs/outputs.controllers.ts +++ b/src/modules/outputs/outputs.controllers.ts @@ -14,7 +14,7 @@ import { OutputsClientService } from 'src/clients/outputs/client.service'; import { AuthenticateCondition } from 'src/authentication/authentication.decorator'; import { PERMISSIONS } from '../../authentication/permissions.enum'; import { OutputsService } from './outputs.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; @ApiTags('Outputs') @Controller('outputs') @@ -39,7 +39,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; ); }) export class OutputsController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/permissions/permissions.controller.spec.ts b/src/modules/permissions/permissions.controller.spec.ts index 9bf04b1..a4db69e 100644 --- a/src/modules/permissions/permissions.controller.spec.ts +++ b/src/modules/permissions/permissions.controller.spec.ts @@ -2,7 +2,7 @@ import { ClientsModule } from '@nestjs/microservices'; import { Test, TestingModule } from '@nestjs/testing'; import { DucClient } from 'src/clients/duc/client.config'; import { PermissionsController } from './permissions.controller'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { PermissionsService } from './permissions.service'; const ducClient = new DucClient(); diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index 4b32ec0..ba50ce4 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -1,6 +1,6 @@ import { Controller, Get, Headers, Inject } from '@nestjs/common'; import { ApiHeader, ApiOkResponse, ApiTags } from '@nestjs/swagger'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { Authenticated, RequireAllPermissions, @@ -24,7 +24,7 @@ import { PermissionsService } from './permissions.service'; }) @Authenticated() export class PermissionsController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) diff --git a/src/modules/permissions/permissions.module.ts b/src/modules/permissions/permissions.module.ts index 4475a81..b1155d4 100644 --- a/src/modules/permissions/permissions.module.ts +++ b/src/modules/permissions/permissions.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { ClientsModule } from '@nestjs/microservices'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { PermissionsService } from './permissions.service'; diff --git a/src/modules/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index f6d27bc..3dfc3d8 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -10,7 +10,7 @@ import { lastValueFrom } from 'rxjs'; import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; import { PermissionsProtoService as PermissionsServiceInterface } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; import { InjectPermissionsRequest } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { PERMISSIONS, PermissionUsages, @@ -25,7 +25,7 @@ import { LanguageEnum } from 'src/utils/languages.enum'; export class PermissionsService implements OnModuleInit, OnApplicationBootstrap { - logger: any; + logger: DadosferaLogger; private permissionsClientService: PermissionsServiceInterface; constructor( diff --git a/src/modules/pipelines/pipelines.controller.ts b/src/modules/pipelines/pipelines.controller.ts index 5267807..108bb60 100644 --- a/src/modules/pipelines/pipelines.controller.ts +++ b/src/modules/pipelines/pipelines.controller.ts @@ -13,7 +13,7 @@ import { PipelinesClientService } from 'src/clients/pipelines/client.service'; import { AuthenticateCondition } from 'src/authentication/authentication.decorator'; import { PERMISSIONS } from '../../authentication/permissions.enum'; import { PipelinesService } from './pipelines.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; @ApiTags('Pipelines') @Controller('pipelines') @@ -38,7 +38,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; ); }) export class PipelinesController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/roles/roles.controller.spec.ts b/src/modules/roles/roles.controller.spec.ts index 38448bc..e062694 100644 --- a/src/modules/roles/roles.controller.spec.ts +++ b/src/modules/roles/roles.controller.spec.ts @@ -3,7 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { DucClient } from 'src/clients/duc/client.config'; import { RolesController } from './roles.controller'; import { RolesService } from './roles.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { PermissionsModule } from '../permissions/permissions.module'; const ducClient = new DucClient(); diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index 98ecbbe..abcdebc 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -19,7 +19,7 @@ import { ApiTags, } from '@nestjs/swagger'; import { RequestUser, User } from 'src/authentication/user.decorator'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { RolesService } from './roles.service'; import { GrantPermissionsToRoleReq, @@ -57,7 +57,7 @@ import { LanguageEnum } from 'src/utils/languages.enum'; @Authenticated() @Controller('roles') export class RolesController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) diff --git a/src/modules/roles/roles.module.ts b/src/modules/roles/roles.module.ts index 2ec4a05..1643b00 100644 --- a/src/modules/roles/roles.module.ts +++ b/src/modules/roles/roles.module.ts @@ -3,7 +3,7 @@ import { ClientsModule } from '@nestjs/microservices'; import { DucClient } from 'src/clients/duc/client.config'; import { RolesController } from './roles.controller'; import { RolesService } from './roles.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { PermissionsModule } from '../permissions/permissions.module'; const ducClient = new DucClient(); diff --git a/src/modules/roles/roles.service.spec.ts b/src/modules/roles/roles.service.spec.ts index 4d8b206..e05341b 100644 --- a/src/modules/roles/roles.service.spec.ts +++ b/src/modules/roles/roles.service.spec.ts @@ -2,7 +2,7 @@ import { ClientsModule } from '@nestjs/microservices'; import { Test, TestingModule } from '@nestjs/testing'; import { RolesController } from './roles.controller'; import { RolesService } from './roles.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { DucClient } from 'src/clients/duc/client.config'; import { PermissionsModule } from '../permissions/permissions.module'; diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index e41ff8d..ed0b27b 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -11,7 +11,7 @@ import { SetRoleUsersReq, UpdateRoleReq, } from './dto/entities'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { Metadata } from '@grpc/grpc-js'; import { ClientGrpc } from '@nestjs/microservices'; import { Permission } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/entities'; @@ -31,7 +31,7 @@ interface GetRolesPermissionsName { } @Injectable() export class RolesService { - logger: any; + logger: DadosferaLogger; private language: LanguageEnum = LanguageEnum.ptbr; private rolesClientService: RolesProtoService; constructor( diff --git a/src/modules/termsOfUse/termsOfUse.controller.ts b/src/modules/termsOfUse/termsOfUse.controller.ts index a2024ae..4b88622 100644 --- a/src/modules/termsOfUse/termsOfUse.controller.ts +++ b/src/modules/termsOfUse/termsOfUse.controller.ts @@ -13,7 +13,7 @@ import { ApiTags } from '@nestjs/swagger'; import { TermsOfUseAcceptRequest } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages'; import { TermsOfUseClientService } from './termsOfUse.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter'; import { RequestUser, User } from '../../authentication/user.decorator'; @@ -22,7 +22,7 @@ import { RequestUser, User } from '../../authentication/user.decorator'; @UseFilters(new GrpcToHttpExceptionFilter()) @Controller('terms-of-use') export class TermsOfUseController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) diff --git a/src/modules/termsOfUse/termsOfUse.module.ts b/src/modules/termsOfUse/termsOfUse.module.ts index e1b3eab..51c7d69 100644 --- a/src/modules/termsOfUse/termsOfUse.module.ts +++ b/src/modules/termsOfUse/termsOfUse.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { ClientsModule } from '@nestjs/microservices'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { TermsOfUseController } from './termsOfUse.controller'; import { TermsOfUseClientService } from './termsOfUse.service'; diff --git a/src/modules/termsOfUse/termsOfUse.service.ts b/src/modules/termsOfUse/termsOfUse.service.ts index 76cd720..9bbe552 100644 --- a/src/modules/termsOfUse/termsOfUse.service.ts +++ b/src/modules/termsOfUse/termsOfUse.service.ts @@ -1,6 +1,6 @@ import { OnModuleInit, Inject, Injectable } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { lastValueFrom } from 'rxjs'; import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; @@ -12,7 +12,7 @@ import { @Injectable() export class TermsOfUseClientService implements OnModuleInit { - logger: any; + logger: DadosferaLogger; private termsOfUseService: TermsOfUseServiceInterface; constructor( diff --git a/src/modules/transformations/transformations.controller.ts b/src/modules/transformations/transformations.controller.ts index d4dea00..1095aaf 100644 --- a/src/modules/transformations/transformations.controller.ts +++ b/src/modules/transformations/transformations.controller.ts @@ -15,7 +15,7 @@ import { IIdRequest } from 'src/clients/transformations/interfaces'; import { AuthenticateCondition } from 'src/authentication/authentication.decorator'; import { PERMISSIONS } from '../../authentication/permissions.enum'; import { TransformationsService } from './transformations.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; @ApiTags('Transformations') @Controller('transformations') @@ -40,7 +40,7 @@ import { DadosferaLogger } from 'dadosfera-logs'; ); }) export class TransformationsController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/users/users.controller.spec.ts b/src/modules/users/users.controller.spec.ts index 610e16e..04b4e31 100644 --- a/src/modules/users/users.controller.spec.ts +++ b/src/modules/users/users.controller.spec.ts @@ -3,7 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { DucClient } from 'src/clients/duc/client.config'; import { UsersController } from './users.controller'; import { UsersService } from './users.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { RolesModule } from '../roles/roles.module'; import { PermissionsModule } from '../permissions/permissions.module'; diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index a6b6e87..3177269 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -20,7 +20,7 @@ import { ApiOkResponse, ApiTags, } from '@nestjs/swagger'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { RequireAllPermissions } from 'src/authentication/authentication.decorator'; import { PERMISSIONS } from 'src/authentication/permissions.enum'; import { RequestUser, User } from 'src/authentication/user.decorator'; @@ -57,7 +57,7 @@ import { UsersService } from './users.service'; }) @UseFilters(GrpcToHttpExceptionFilter) export class UsersController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) diff --git a/src/modules/users/users.module.ts b/src/modules/users/users.module.ts index 8ff3a49..4d5b88b 100644 --- a/src/modules/users/users.module.ts +++ b/src/modules/users/users.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { UsersController } from './users.controller'; import { UsersService } from './users.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { ClientsModule } from '@nestjs/microservices'; import { DucClient } from 'src/clients/duc/client.config'; import { RolesModule } from '../roles/roles.module'; diff --git a/src/modules/users/users.service.spec.ts b/src/modules/users/users.service.spec.ts index 6b665f5..22281ce 100644 --- a/src/modules/users/users.service.spec.ts +++ b/src/modules/users/users.service.spec.ts @@ -2,7 +2,7 @@ import { ClientsModule } from '@nestjs/microservices'; import { Test, TestingModule } from '@nestjs/testing'; import { UsersController } from './users.controller'; import { UsersService } from './users.service'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { DucClient } from 'src/clients/duc/client.config'; import { RolesModule } from '../roles/roles.module'; import { PermissionsModule } from '../permissions/permissions.module'; diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 4c5fbf7..0fe40de 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -1,6 +1,6 @@ import { OnModuleInit, Inject, Injectable } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; -import { DadosferaLogger } from 'dadosfera-logs'; +import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; import { UsersProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; @@ -26,7 +26,7 @@ import { EnrichErrorCode } from 'src/utils/ErrorBuilder'; @Injectable() export class UsersService implements OnModuleInit { - logger: any; + logger: DadosferaLogger; language: LanguageEnum = LanguageEnum.ptbr; private usersClientService: UsersProtoService;