diff --git a/lib/Utils/CommonUtils.js b/lib/Utils/CommonUtils.js index 94b1f58c..ec8140fd 100644 --- a/lib/Utils/CommonUtils.js +++ b/lib/Utils/CommonUtils.js @@ -33,7 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", { value: true }); exports.sanitisePipelineNameHeader = exports.getAllFileErrors = exports.validateTestRunParamsFromPipeline = exports.getDefaultRunDescription = exports.getDefaultTestRunName = exports.getDefaultTestName = exports.inValidEngineInstances = exports.invalidName = exports.validateUrlcert = exports.validateUrl = exports.validateOutputParametervariableName = exports.validateOverRideParameters = exports.validateAndGetSegregatedManagedIdentities = exports.validateAutoStop = exports.getSubscriptionIdFromResourceId = exports.getResourceGroupFromResourceId = exports.getResourceNameFromResourceId = exports.getResourceTypeFromResourceId = exports.invalidDescription = exports.invalidDisplayName = exports.getFileName = exports.getResultObj = exports.isStatusFailed = exports.isTerminalFileStatusSucceeded = exports.isTerminalFileStatus = exports.isTerminalTestStatus = exports.TryExtractLeadingDecimal = exports.TryExtractLeadingInteger = exports.indexOfFirstDigit = exports.getReportFolder = exports.getResultFolder = exports.getUniqueId = exports.sleep = exports.printClientMetrics = exports.errorCorrection = exports.printCriteria = exports.printTestDuration = exports.checkFileTypes = exports.checkFileType = exports.isNull = exports.isNullOrUndefined = void 0; -const { v4: uuidv4 } = require('uuid'); +const crypto_1 = require("crypto"); const GeneralConstants_1 = require("../Constants/GeneralConstants"); const PayloadModels_1 = require("../models/PayloadModels"); const UtilModels_1 = require("../models/UtilModels"); @@ -165,7 +165,7 @@ function sleep(ms) { } exports.sleep = sleep; function getUniqueId() { - return uuidv4(); + return (0, crypto_1.randomUUID)(); } exports.getUniqueId = getUniqueId; function getResultFolder(testArtifacts) { diff --git a/package-lock.json b/package-lock.json index 8f744b0b..c43c4582 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "@actions/core": "^1.10.1", + "@actions/core": "^1.11.1", "@types/q": "^1.5.8", "adm-zip": "^0.6.1", "extract-zip": "^2.0.1", @@ -24,7 +24,7 @@ "@types/node": "^24", "@types/sinon": "^17.0.4", "jest": "^29.7.0", - "jest-junit": "^16.0.0", + "jest-junit": "^17.0.0", "jwt-check-expiration": "^1.0.5", "nock": "^14.0.1", "sinon": "^19.0.2", @@ -33,12 +33,22 @@ } }, "node_modules/@actions/core": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz", - "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz", + "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==", + "license": "MIT", + "dependencies": { + "@actions/exec": "^1.1.1", + "@actions/http-client": "^2.0.1" + } + }, + "node_modules/@actions/exec": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz", + "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==", + "license": "MIT", "dependencies": { - "@actions/http-client": "^2.0.1", - "uuid": "^8.3.2" + "@actions/io": "^1.0.1" } }, "node_modules/@actions/http-client": { @@ -50,6 +60,12 @@ "undici": "^5.25.4" } }, + "node_modules/@actions/io": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz", + "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==", + "license": "MIT" + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -2707,18 +2723,19 @@ } }, "node_modules/jest-junit": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-16.0.0.tgz", - "integrity": "sha512-A94mmw6NfJab4Fg/BlvVOUXzXgF0XIH6EmTgJ5NDPp4xoKq0Kr7sErb+4Xs9nZvu58pJojz5RFGpqnZYJTrRfQ==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-17.0.0.tgz", + "integrity": "sha512-RYWCkq4j59gUXj5DsgbIE7xFBZzu1gtibPhyjSjMmGaOTLnqlXhg7x9zuGCwgbCuMAyoyvk0Mi8wSrRR5uOeLA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "mkdirp": "^1.0.4", "strip-ansi": "^6.0.1", - "uuid": "^8.3.2", + "uuid": "^14.0.0", "xml": "^1.0.1" }, "engines": { - "node": ">=10.12.0" + "node": ">=20.0.0" } }, "node_modules/jest-leak-detector": { @@ -4326,11 +4343,17 @@ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" }, "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.1.tgz", + "integrity": "sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew==", + "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", "bin": { - "uuid": "dist/bin/uuid" + "uuid": "dist-node/bin/uuid" } }, "node_modules/v8-to-istanbul": { diff --git a/package.json b/package.json index 76a5cb8e..3bf05184 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "lint:fix": "eslint . --fix" }, "dependencies": { - "@actions/core": "^1.10.1", + "@actions/core": "^1.11.1", "@types/q": "^1.5.8", "adm-zip": "^0.6.1", "extract-zip": "^2.0.1", @@ -42,7 +42,7 @@ "@types/node": "^24", "@types/sinon": "^17.0.4", "jest": "^29.7.0", - "jest-junit": "^16.0.0", + "jest-junit": "^17.0.0", "jwt-check-expiration": "^1.0.5", "ts-jest": "^29.1.2", "typescript": "^5.4.3", diff --git a/src/Utils/CommonUtils.ts b/src/Utils/CommonUtils.ts index fd44e5fb..538dc34f 100644 --- a/src/Utils/CommonUtils.ts +++ b/src/Utils/CommonUtils.ts @@ -1,5 +1,5 @@ import { IHttpClientResponse } from 'typed-rest-client/Interfaces'; -const { v4: uuidv4 } = require('uuid'); +import { randomUUID } from 'crypto'; import { autoStopDisable, OverRideParametersModel } from '../Constants/GeneralConstants'; import { PassFailMetric, Statistics, TestRunArtifacts, TestRunModel, TestModel, FileStatus } from '../models/PayloadModels'; import { RunTimeParams, PassFailCount, ReferenceIdentityKinds, AllManagedIdentitiesSegregated, ValidationModel } from '../models/UtilModels'; @@ -129,7 +129,7 @@ export function sleep(ms:number) { } export function getUniqueId() { - return uuidv4(); + return randomUUID(); } export function getResultFolder(testArtifacts:TestRunArtifacts | undefined) {