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 a63a63d..b093142 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,8 @@ "license": "UNLICENSED", "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", + "@dadosfera/dadosfera-logs": "^1.0.0-beta.3", + "@dadosfera/protospack-v2": "3.10.0", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/common": "^8.4.7", @@ -23,7 +25,6 @@ "@nestjs/swagger": "^5.2.1", "axios": "^0.25.0", "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", @@ -36,7 +37,6 @@ "passport-hubspot-oauth2": "^1.0.3", "passport-mailchimp": "^1.1.0", "protospack": "2.5.2", - "protospack-v2": "3.9.6", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", @@ -1712,6 +1712,26 @@ "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.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.10.0.tgz", + "integrity": "sha512-XPfRh2R2zZtN/MRxAwbC994xDJftRlnl3w2vqPGMt996tJCpZkedzdH1hHdqer68QDIMM5td0OpW/Gs8K1H07A==", + "dependencies": { + "@grpc/grpc-js": "^1.6.7", + "rxjs": "^7.5.5", + "ts-proto": "^1.112.2" + } + }, "node_modules/@elastic/ecs-helpers": { "version": "1.1.0", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@elastic/ecs-helpers/-/ecs-helpers-1.1.0.tgz", @@ -4564,16 +4584,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, @@ -9014,16 +9024,6 @@ "rxjs": "^7.5.5" } }, - "node_modules/protospack-v2": { - "version": "3.9.6", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.6.tgz", - "integrity": "sha512-7aSYhzxlly6GPGmCH2JsNDB3Z6rOPhmY5iK5n1Ich3WLLgsOmGAXJH2zWD9IUfjhKKwBZGvitdewpBVyCvAg0A==", - "dependencies": { - "@grpc/grpc-js": "^1.6.7", - "rxjs": "^7.5.5", - "ts-proto": "^1.112.2" - } - }, "node_modules/proxy-addr": { "version": "2.0.7", "license": "MIT", @@ -12276,6 +12276,26 @@ "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.0", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.10.0.tgz", + "integrity": "sha512-XPfRh2R2zZtN/MRxAwbC994xDJftRlnl3w2vqPGMt996tJCpZkedzdH1hHdqer68QDIMM5td0OpW/Gs8K1H07A==", + "requires": { + "@grpc/grpc-js": "^1.6.7", + "rxjs": "^7.5.5", + "ts-proto": "^1.112.2" + } + }, "@elastic/ecs-helpers": { "version": "1.1.0", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@elastic/ecs-helpers/-/ecs-helpers-1.1.0.tgz", @@ -14239,16 +14259,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, @@ -17244,16 +17254,6 @@ "rxjs": "^7.5.5" } }, - "protospack-v2": { - "version": "3.9.6", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.9.6.tgz", - "integrity": "sha512-7aSYhzxlly6GPGmCH2JsNDB3Z6rOPhmY5iK5n1Ich3WLLgsOmGAXJH2zWD9IUfjhKKwBZGvitdewpBVyCvAg0A==", - "requires": { - "@grpc/grpc-js": "^1.6.7", - "rxjs": "^7.5.5", - "ts-proto": "^1.112.2" - } - }, "proxy-addr": { "version": "2.0.7", "requires": { diff --git a/package.json b/package.json index 09ef57f..3b5ed08 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@nestjs/swagger": "^5.2.1", "axios": "^0.25.0", "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", @@ -51,7 +51,7 @@ "passport-hubspot-oauth2": "^1.0.3", "passport-mailchimp": "^1.1.0", "protospack": "2.5.2", - "protospack-v2": "3.9.6", + "@dadosfera/protospack-v2": "3.10.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/app.module.ts b/src/app.module.ts index c82ce41..91b45bf 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'; const inputClient = new InputsClientConfiguration(); 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/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/duc/client.config.ts b/src/clients/duc/client.config.ts index bac3a13..774fd80 100644 --- a/src/clients/duc/client.config.ts +++ b/src/clients/duc/client.config.ts @@ -1,6 +1,6 @@ import { credentials } from '@grpc/grpc-js'; import { ClientOptions, Transport } from '@nestjs/microservices'; -import { ProtoPackages, ProtoPaths } from 'protospack-v2/dist/lib/Duc'; +import { ProtoPackages, ProtoPaths } from '@dadosfera/protospack-v2/dist/lib/Duc'; export class DucClient { config(): ClientOptions { 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 6db6a51..e664c96 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -19,17 +19,17 @@ import { AuthEnableTotpMfaRequest, AuthDisableTotpMfaRequest, AuthVerifyTotpMfaRequest, -} from 'protospack-v2/dist/lib/Duc/interfaces/messages'; +} 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 664dcbb..0da58eb 100644 --- a/src/modules/auth/auth.service.ts +++ b/src/modules/auth/auth.service.ts @@ -1,10 +1,10 @@ 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 'protospack-v2/dist/lib/Duc'; -import { AuthProtoService as AuthServiceInterface } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; +import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; +import { AuthProtoService as AuthServiceInterface } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; import { AuthSignInRequest, AuthRefreshAccessTokenRequest, @@ -16,11 +16,11 @@ import { AuthResetPasswordRequest, AuthVerifyResetPasswordCodeRequest, AuthConfirmResetPasswordRequest, -} from 'protospack-v2/dist/lib/Duc/interfaces/messages'; +} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages'; @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/connector/client.config.ts b/src/modules/connector/client.config.ts index c35707c..a13ea3e 100644 --- a/src/modules/connector/client.config.ts +++ b/src/modules/connector/client.config.ts @@ -1,6 +1,6 @@ import { credentials } from '@grpc/grpc-js'; import { ClientOptions, Transport } from '@nestjs/microservices'; -import { ConnectorManager } from 'protospack-v2'; +import { ConnectorManager } from '@dadosfera/protospack-v2'; export class ConnectorClientConfiguration { config(): ClientOptions { diff --git a/src/modules/connector/client.service.ts b/src/modules/connector/client.service.ts index 6400b9b..5c4a9d1 100644 --- a/src/modules/connector/client.service.ts +++ b/src/modules/connector/client.service.ts @@ -6,7 +6,7 @@ import { HttpStatus, } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; -import { ConnectorManager } from 'protospack-v2'; +import { ConnectorManager } from '@dadosfera/protospack-v2'; import { lastValueFrom } from 'rxjs'; export class ConnectorClientService implements OnModuleInit { 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/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 ed8f5e6..3dfc3d8 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -7,10 +7,10 @@ import { import { ClientGrpc } from '@nestjs/microservices'; import { lastValueFrom } from 'rxjs'; -import { ProtoServices } from 'protospack-v2/dist/lib/Duc'; -import { PermissionsProtoService as PermissionsServiceInterface } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; -import { InjectPermissionsRequest } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; -import { DadosferaLogger } from 'dadosfera-logs'; +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/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 8ed8abc..ed0b27b 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -1,6 +1,6 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common'; -import { ProtoServices } from 'protospack-v2/dist/lib/Duc'; -import { RolesProtoService } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; +import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; +import { RolesProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; import { CreateRoleReq, GetRolesByCustomerReq, @@ -11,10 +11,10 @@ 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 'protospack-v2/dist/lib/Duc/interfaces/entities'; +import { Permission } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/entities'; import { lastValueFrom } from 'rxjs'; import { PermissionsService } from '../permissions/permissions.service'; import { LanguageEnum } from 'src/utils/languages.enum'; @@ -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 f5de808..4b88622 100644 --- a/src/modules/termsOfUse/termsOfUse.controller.ts +++ b/src/modules/termsOfUse/termsOfUse.controller.ts @@ -10,10 +10,10 @@ import { UseFilters, } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { TermsOfUseAcceptRequest } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; +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 b839795..9bbe552 100644 --- a/src/modules/termsOfUse/termsOfUse.service.ts +++ b/src/modules/termsOfUse/termsOfUse.service.ts @@ -1,18 +1,18 @@ 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 'protospack-v2/dist/lib/Duc'; -import { TermsOfUseProtoService as TermsOfUseServiceInterface } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; +import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; +import { TermsOfUseProtoService as TermsOfUseServiceInterface } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; import { TermsOfUseGetTokenRequest, TermsOfUseAcceptRequest, -} from 'protospack-v2/dist/lib/Duc/interfaces/messages'; +} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages'; @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 0ae8852..0fe40de 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -1,15 +1,15 @@ 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 'protospack-v2/dist/lib/Duc'; -import { UsersProtoService } from 'protospack-v2/dist/lib/Duc/interfaces/write-service'; +import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc'; +import { UsersProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service'; import { AssignRoleToUserRequest, IdRequest, UnassignRoleFromUserRequest, UserCreateRequest, -} from 'protospack-v2/dist/lib/Duc/interfaces/messages'; +} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages'; import { lastValueFrom } from 'rxjs'; import { BatchCreateUserReq, @@ -21,12 +21,12 @@ import { import { RolesService } from '../roles/roles.service'; import { HIERARCHIES } from './hierarchies'; import { LanguageEnum } from 'src/utils/languages.enum'; -import { UserByCustomer } from 'protospack-v2/dist/lib/Duc/interfaces/entities'; +import { UserByCustomer } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/entities'; import { EnrichErrorCode } from 'src/utils/ErrorBuilder'; @Injectable() export class UsersService implements OnModuleInit { - logger: any; + logger: DadosferaLogger; language: LanguageEnum = LanguageEnum.ptbr; private usersClientService: UsersProtoService;