From 5356334258773a2b496f3a93a1d405a7963fe851 Mon Sep 17 00:00:00 2001 From: Arthur Simas Date: Mon, 1 Aug 2022 14:41:15 -0300 Subject: [PATCH] FEAT: using scoped package @dadosfera/protospack-v2 --- Dockerfile | 2 +- package-lock.json | 42 +++++++++---------- package.json | 2 +- src/clients/duc/client.config.ts | 2 +- src/modules/auth/auth.controller.ts | 2 +- src/modules/auth/auth.service.ts | 6 +-- src/modules/connector/client.config.ts | 2 +- src/modules/connector/client.service.ts | 2 +- .../permissions/permissions.service.ts | 6 +-- src/modules/roles/roles.service.ts | 6 +-- .../termsOfUse/termsOfUse.controller.ts | 2 +- src/modules/termsOfUse/termsOfUse.service.ts | 6 +-- src/modules/users/users.service.ts | 8 ++-- 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba242b6..f3151dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ 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 \ + && aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1 \ && npm install FROM node:18.3.0-alpine3.15 diff --git a/package-lock.json b/package-lock.json index a63a63d..f47f255 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/protospack-v2": "3.10.0-beta.5", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/common": "^8.4.7", @@ -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,16 @@ "kuler": "^2.0.0" } }, + "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==", + "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", @@ -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,16 @@ "kuler": "^2.0.0" } }, + "@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==", + "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", @@ -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..3d63d67 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", - "protospack-v2": "3.9.6", + "@dadosfera/protospack-v2": "3.10.0-beta.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", 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/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index 6db6a51..2e4b54c 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -19,7 +19,7 @@ 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'; diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts index 664dcbb..de998f9 100644 --- a/src/modules/auth/auth.service.ts +++ b/src/modules/auth/auth.service.ts @@ -3,8 +3,8 @@ import { ClientGrpc } from '@nestjs/microservices'; import { DadosferaLogger } from '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,7 +16,7 @@ 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 { 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/permissions/permissions.service.ts b/src/modules/permissions/permissions.service.ts index ed8f5e6..f6d27bc 100644 --- a/src/modules/permissions/permissions.service.ts +++ b/src/modules/permissions/permissions.service.ts @@ -7,9 +7,9 @@ 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 { 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 { PERMISSIONS, diff --git a/src/modules/roles/roles.service.ts b/src/modules/roles/roles.service.ts index 8ed8abc..e41ff8d 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, @@ -14,7 +14,7 @@ import { import { DadosferaLogger } from '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'; diff --git a/src/modules/termsOfUse/termsOfUse.controller.ts b/src/modules/termsOfUse/termsOfUse.controller.ts index f5de808..a2024ae 100644 --- a/src/modules/termsOfUse/termsOfUse.controller.ts +++ b/src/modules/termsOfUse/termsOfUse.controller.ts @@ -10,7 +10,7 @@ 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'; diff --git a/src/modules/termsOfUse/termsOfUse.service.ts b/src/modules/termsOfUse/termsOfUse.service.ts index b839795..76cd720 100644 --- a/src/modules/termsOfUse/termsOfUse.service.ts +++ b/src/modules/termsOfUse/termsOfUse.service.ts @@ -3,12 +3,12 @@ import { ClientGrpc } from '@nestjs/microservices'; import { DadosferaLogger } from '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 { diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 0ae8852..4c5fbf7 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -2,14 +2,14 @@ import { OnModuleInit, Inject, Injectable } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; import { DadosferaLogger } from '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,7 +21,7 @@ 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()