diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 38bb365..806eb70 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -59,9 +59,8 @@ jobs: run: docker compose -f docker-compose.yml -f docker-compose.ldap.yml down - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master + uses: SonarSource/sonarqube-scan-action@v5 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} test-migrations: diff --git a/src/static/aws/s3.service.ts b/src/static/aws/s3.service.ts index 4ff2a97..42a7a4c 100644 --- a/src/static/aws/s3.service.ts +++ b/src/static/aws/s3.service.ts @@ -4,6 +4,7 @@ import { Static } from '../static.interface'; import { DeleteObjectCommand, GetObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3'; import { Readable } from 'stream'; import { getSignedUrl } from '@aws-sdk/s3-request-presigner'; +import { generateNewImageName } from '../utils'; export class AWSS3Service implements Static { private readonly logger: Logger = new Logger(AWSS3Service.name); @@ -26,7 +27,7 @@ export class AWSS3Service implements Static { } async saveImage(type: 'screenshot' | 'diff' | 'baseline', imageBuffer: Buffer): Promise { - const imageName = `${Date.now()}.${type}.png`; + const imageName = generateNewImageName(type); try { await this.s3Client.send( new PutObjectCommand({ diff --git a/src/static/hdd/hdd.service.ts b/src/static/hdd/hdd.service.ts index 09b7052..60ad363 100644 --- a/src/static/hdd/hdd.service.ts +++ b/src/static/hdd/hdd.service.ts @@ -2,15 +2,15 @@ import { Logger } from '@nestjs/common'; import path from 'path'; import { writeFileSync, readFileSync, unlink, mkdirSync, existsSync } from 'fs'; import { PNG, PNGWithMetadata } from 'pngjs'; -import uuidAPIKey from 'uuid-apikey'; import { Static } from '../static.interface'; import { HDD_IMAGE_PATH } from './constants'; +import { generateNewImageName } from '../utils'; export class HddService implements Static { private readonly logger: Logger = new Logger(HddService.name); generateNewImage(type: 'screenshot' | 'diff' | 'baseline'): { imageName: string; imagePath: string } { - const imageName = `${uuidAPIKey.create({ noDashes: true }).apiKey}.${type}.png`; + const imageName = generateNewImageName(type); return { imageName, imagePath: this.getImagePath(imageName), diff --git a/src/static/utils.ts b/src/static/utils.ts index a684b66..310061d 100644 --- a/src/static/utils.ts +++ b/src/static/utils.ts @@ -1,3 +1,5 @@ +import uuidAPIKey from 'uuid-apikey'; + export function isHddStaticServiceConfigured() { return !process.env.STATIC_SERVICE || process.env.STATIC_SERVICE === 'hdd'; } @@ -5,3 +7,7 @@ export function isHddStaticServiceConfigured() { export function isS3ServiceConfigured() { return !process.env.STATIC_SERVICE || process.env.STATIC_SERVICE === 's3'; } + +export function generateNewImageName(type: 'screenshot' | 'diff' | 'baseline'): string { + return `${uuidAPIKey.create({ noDashes: true }).apiKey}.${type}.png`; +}