diff --git a/.gitignore b/.gitignore index 7c1dd9f..17a63ae 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,6 @@ lerna-debug.log* # Ignore .env files *.env -.env \ No newline at end of file +.env + +swagger.json \ No newline at end of file diff --git a/Insomnia_2022-07-11.zip b/Insomnia_2022-07-11.zip deleted file mode 100644 index b71f8c6..0000000 Binary files a/Insomnia_2022-07-11.zip and /dev/null differ diff --git a/package-lock.json b/package-lock.json index 5bbab1f..e9836ce 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.11.3", + "@dadosfera/protospack-v2": "3.11.4", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/common": "^8.4.7", @@ -1725,9 +1725,9 @@ } }, "node_modules/@dadosfera/protospack-v2": { - "version": "3.11.3", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.11.3.tgz", - "integrity": "sha512-gcAd3TeEfNH3ZVN/H9vct8T5NEnGAZpunnW/x/fRwEyJ8EMizRjxN7drAUXpabfMY0K33BnbDCbBKAuiHADqRA==", + "version": "3.11.4", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.11.4.tgz", + "integrity": "sha512-Rp+v/plT4m/xDHGa8lTkDANY/vlz21ditCH5mrzNY1yONOpoVSQtcMRlnaOrfjZMLw844+Lv+Br2VHc4p+lPMw==", "dependencies": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", @@ -12283,9 +12283,9 @@ } }, "@dadosfera/protospack-v2": { - "version": "3.11.3", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.11.3.tgz", - "integrity": "sha512-gcAd3TeEfNH3ZVN/H9vct8T5NEnGAZpunnW/x/fRwEyJ8EMizRjxN7drAUXpabfMY0K33BnbDCbBKAuiHADqRA==", + "version": "3.11.4", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.11.4.tgz", + "integrity": "sha512-Rp+v/plT4m/xDHGa8lTkDANY/vlz21ditCH5mrzNY1yONOpoVSQtcMRlnaOrfjZMLw844+Lv+Br2VHc4p+lPMw==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index 640915b..adc6277 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "passport-hubspot-oauth2": "^1.0.3", "passport-mailchimp": "^1.1.0", "protospack": "2.5.2", - "@dadosfera/protospack-v2": "3.11.3", + "@dadosfera/protospack-v2": "3.11.4", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.5.5", diff --git a/src/main.ts b/src/main.ts index 7f60009..b931951 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,6 +7,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import documentEmpty from '../swagger_empty.json'; import { AppModule } from './app.module'; +import { writeFileSync } from 'fs'; async function bootstrap() { DadosferaLogger.setupLogger({ serviceName: 'maestro', @@ -40,6 +41,8 @@ async function bootstrap() { const document = SwaggerModule.createDocument(app, config); + await writeFileSync('swagger.json', JSON.stringify(document)); + if (process.env.ENV != 'stg' && process.env.ENV != 'prd') SwaggerModule.setup('api', app, document); diff --git a/src/modules/network-config/dto/network-config.ts b/src/modules/network-config/dto/network-config.ts index b94a03b..b738380 100644 --- a/src/modules/network-config/dto/network-config.ts +++ b/src/modules/network-config/dto/network-config.ts @@ -1,4 +1,7 @@ -import { NetworkConfigEntity } from '@dadosfera/protospack-v2/dist/lib/NetworkConfig/interfaces/entities'; +import { + NetworkConfigEntity, + NetworkConfigToCatalog, +} from '@dadosfera/protospack-v2/dist/lib/NetworkConfig/interfaces/entities'; import { ApiProperty, ApiPropertyOptional, @@ -59,14 +62,49 @@ export class NetworkConfigOpenVpnProperties { @ApiPropertyOptional() TLS_AUTH_FILE?: string; } + +export class NetworkConfigToCatalogDto implements NetworkConfigToCatalog { + @ApiProperty() + id: string; + + @ApiProperty() + customer_id: string; + + @ApiProperty() + plugin: string; + + @ApiProperty() + type: string; + + @ApiProperty() + name: string; + + @ApiProperty() + description: string; + + @ApiProperty() + created_at: string; + + @ApiProperty() + updated_at: string; + + @ApiProperty() + network_type_id: string; + + @ApiProperty() + network_type_name: string; +} export class FindAllNetworkConfigsRes { - @ApiProperty({ type: [NetworkConfigNoSecrets] }) - network_configs: NetworkConfigNoSecrets[]; + @ApiProperty({ type: [NetworkConfigToCatalogDto] }) + network_configs: NetworkConfigToCatalogDto[]; + + @ApiProperty() + message: string; } export class FindNetworkConfigByidRes { @ApiProperty() - network_config: NetworkConfigNoSecrets; + network_config: NetworkConfigToCatalogDto; } export class FindNetworkConfigByidDetails extends PickType(NetworkConfigDto, [ @@ -104,7 +142,7 @@ export class CreateNetworkConfigReq extends PickType(NetworkConfigDto, [ } export class CreateNetworkConfigRes { @ApiProperty() - network_config: NetworkConfigNoSecrets; + network_config: NetworkConfigToCatalogDto; } export class UpdateNetworkConfigReq { @@ -115,7 +153,7 @@ export class UpdateNetworkConfigReq { } export class UpdateNetworkConfigRes { @ApiProperty() - network_config: NetworkConfigNoSecrets; + network_config: NetworkConfigToCatalogDto; } export class DeleteNetworkConfigRes {