diff --git a/package-lock.json b/package-lock.json index 3af537d..b093142 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.3", - "@dadosfera/protospack-v2": "3.10.0-beta.5", + "@dadosfera/protospack-v2": "3.10.0", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/common": "^8.4.7", @@ -1723,9 +1723,9 @@ } }, "node_modules/@dadosfera/protospack-v2": { - "version": "3.10.0-beta.5", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.10.0-beta.5.tgz", - "integrity": "sha512-ntGTo/LC6Kx+dzedA6IkpkyI4SILiHGXr4K0R+StSARj8t6G+j9Kk1AcPvvsdZubS+u64rI93Yl9G0o9O5BRYA==", + "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", @@ -12287,9 +12287,9 @@ } }, "@dadosfera/protospack-v2": { - "version": "3.10.0-beta.5", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.10.0-beta.5.tgz", - "integrity": "sha512-ntGTo/LC6Kx+dzedA6IkpkyI4SILiHGXr4K0R+StSARj8t6G+j9Kk1AcPvvsdZubS+u64rI93Yl9G0o9O5BRYA==", + "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", diff --git a/package.json b/package.json index bca6dbe..3b5ed08 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "passport-hubspot-oauth2": "^1.0.3", "passport-mailchimp": "^1.1.0", "protospack": "2.5.2", - "@dadosfera/protospack-v2": "3.10.0-beta.5", + "@dadosfera/protospack-v2": "3.10.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/authentication/authentication.guard.ts b/src/authentication/authentication.guard.ts index ecd58c5..44b3a75 100644 --- a/src/authentication/authentication.guard.ts +++ b/src/authentication/authentication.guard.ts @@ -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/clients/inputs/client.service.ts b/src/clients/inputs/client.service.ts index f52d4d7..c6da694 100644 --- a/src/clients/inputs/client.service.ts +++ b/src/clients/inputs/client.service.ts @@ -31,7 +31,7 @@ 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 20a20be..71fbccb 100644 --- a/src/clients/outputs/client.service.ts +++ b/src/clients/outputs/client.service.ts @@ -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 268e261..e0631d9 100644 --- a/src/clients/pipelines/client.service.ts +++ b/src/clients/pipelines/client.service.ts @@ -21,7 +21,7 @@ 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 041cbee..8f70965 100644 --- a/src/clients/transformations/client.service.ts +++ b/src/clients/transformations/client.service.ts @@ -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 3718eaf..4ae9097 100644 --- a/src/main.ts +++ b/src/main.ts @@ -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 39c4de4..e664c96 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -29,7 +29,7 @@ import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.fi @UseFilters(new GrpcToHttpExceptionFilter()) @Controller('auth') export class AuthController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts index 267d858..0da58eb 100644 --- a/src/modules/auth/auth.service.ts +++ b/src/modules/auth/auth.service.ts @@ -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 9bcd21b..bb7cb84 100644 --- a/src/modules/catalog/catalog.controller.ts +++ b/src/modules/catalog/catalog.controller.ts @@ -37,7 +37,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; ); }) export class CatalogController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/connector/connector.controller.ts b/src/modules/connector/connector.controller.ts index cfcb07b..5529d1a 100644 --- a/src/modules/connector/connector.controller.ts +++ b/src/modules/connector/connector.controller.ts @@ -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/health/health.controller.ts b/src/modules/health/health.controller.ts index 1419c47..67f5ffa 100644 --- a/src/modules/health/health.controller.ts +++ b/src/modules/health/health.controller.ts @@ -6,7 +6,7 @@ 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 f79f6cf..3934985 100644 --- a/src/modules/health/health.service.ts +++ b/src/modules/health/health.service.ts @@ -3,7 +3,7 @@ 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 6c05af1..c464b9d 100644 --- a/src/modules/inputs/inputs.controller.ts +++ b/src/modules/inputs/inputs.controller.ts @@ -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 77f1b1a..588417f 100644 --- a/src/modules/outputs/outputs.controllers.ts +++ b/src/modules/outputs/outputs.controllers.ts @@ -39,7 +39,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; ); }) export class OutputsController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/permissions/permissions.controller.ts b/src/modules/permissions/permissions.controller.ts index e4eafd9..ba50ce4 100644 --- a/src/modules/permissions/permissions.controller.ts +++ b/src/modules/permissions/permissions.controller.ts @@ -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.service.ts b/src/modules/permissions/permissions.service.ts index 0c4f0f9..3dfc3d8 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -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 0ac2f0c..108bb60 100644 --- a/src/modules/pipelines/pipelines.controller.ts +++ b/src/modules/pipelines/pipelines.controller.ts @@ -38,7 +38,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; ); }) export class PipelinesController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/roles/roles.controller.ts b/src/modules/roles/roles.controller.ts index 84fa4b3..abcdebc 100644 --- a/src/modules/roles/roles.controller.ts +++ b/src/modules/roles/roles.controller.ts @@ -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.service.ts b/src/modules/roles/roles.service.ts index b0de2aa..ed0b27b 100644 --- a/src/modules/roles/roles.service.ts +++ b/src/modules/roles/roles.service.ts @@ -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 5e2d874..4b88622 100644 --- a/src/modules/termsOfUse/termsOfUse.controller.ts +++ b/src/modules/termsOfUse/termsOfUse.controller.ts @@ -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.service.ts b/src/modules/termsOfUse/termsOfUse.service.ts index ea56287..9bbe552 100644 --- a/src/modules/termsOfUse/termsOfUse.service.ts +++ b/src/modules/termsOfUse/termsOfUse.service.ts @@ -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 93fc725..1095aaf 100644 --- a/src/modules/transformations/transformations.controller.ts +++ b/src/modules/transformations/transformations.controller.ts @@ -40,7 +40,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; ); }) export class TransformationsController { - logger: any; + logger: DadosferaLogger; constructor( @Inject(DadosferaLogger) dadosferaLogger: DadosferaLogger, diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index 9c53858..3177269 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -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.service.ts b/src/modules/users/users.service.ts index f4f0cfe..0fe40de 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -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;