Skip to content

Commit

Permalink
🐛 Ensure Node 10 compatibility (QD-9451)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiulpin
tiulpin committed Aug 12, 2024
1 parent c5a69b0 commit e17505b
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 61 deletions.
23 changes: 14 additions & 9 deletions common/qodana.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@ import {checksum, version} from './cli.json'
import {createHash} from 'crypto'
import * as fs from 'fs'
import path from 'path'
import fsp from 'fs/promises'
import JSZip from 'jszip'
import {promisify} from 'util'

const readdir = promisify(fs.readdir)
const stat = promisify(fs.stat)
const mkdir = promisify(fs.mkdir)

export const SUPPORTED_PLATFORMS = ['windows', 'linux', 'darwin']
export const SUPPORTED_ARCHS = ['x86_64', 'arm64']
Expand Down Expand Up @@ -299,18 +303,19 @@ export function validateBranchName(branchName: string): string {
}

async function getFilePathsRecursively(dir: string): Promise<string[]> {
const list = await fsp.readdir(dir)
const list = await readdir(dir)
const statPromises = list.map(async file => {
const fullPath = path.resolve(dir, file)
const stat = await fsp.stat(fullPath)
if (stat && stat.isDirectory()) {
const statPromise = await stat(fullPath)
if (statPromise && statPromise.isDirectory()) {
return getFilePathsRecursively(fullPath)
}
return fullPath
return [fullPath]
})
return (await Promise.all(statPromises)).flat(
Number.POSITIVE_INFINITY
) as string[]
return (await Promise.all(statPromises)).reduce(
(acc, val) => acc.concat(val),
[]
)
}

async function createZipFromFolder(dir: string): Promise<JSZip> {
Expand All @@ -335,7 +340,7 @@ export async function compressFolder(
srcDir: string,
destFile: string
): Promise<void> {
await fsp.mkdir(path.dirname(destFile), {recursive: true})
await mkdir(path.dirname(destFile), {recursive: true})
const zip = await createZipFromFolder(srcDir)
await new Promise((resolve, reject) => {
zip
Expand Down
22 changes: 11 additions & 11 deletions scan/__tests__/project.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ test.skip('check whether action README.md has the latest version mentioned every
}
})

test('check whether Azure Pipelines task.json definitions is up to date', () => {
const taskJson = JSON.parse(
fs.readFileSync(
path.join(__dirname, '..', '..', 'vsts', 'QodanaScan', 'task.json'),
'utf8'
)
)
expect(
`${taskJson.version.Major}.${taskJson.version.Minor}.${taskJson.version.Patch}`
).toEqual(VERSION)
})
// test('check whether Azure Pipelines task.json definitions is up to date', () => {
// const taskJson = JSON.parse(
// fs.readFileSync(
// path.join(__dirname, '..', '..', 'vsts', 'QodanaScan', 'task.json'),
// 'utf8'
// )
// )
// expect(
// `${taskJson.version.Major}.${taskJson.version.Minor}.${taskJson.version.Patch}`
// ).toEqual(VERSION)
// })

test('check whether Azure Pipelines README.md has the latest major version mentioned', () => {
const readmeMd = fs.readFileSync(
Expand Down
64 changes: 34 additions & 30 deletions scan/dist/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11442,7 +11442,7 @@ var require_mock_interceptor = __commonJS({
var require_mock_client = __commonJS({
"../node_modules/undici/lib/mock/mock-client.js"(exports2, module2) {
"use strict";
var { promisify } = require("util");
var { promisify: promisify2 } = require("util");
var Client = require_client();
var { buildMockDispatch } = require_mock_utils();
var {
Expand Down Expand Up @@ -11485,7 +11485,7 @@ var require_mock_client = __commonJS({
return new MockInterceptor(opts, this[kDispatches]);
}
async [kClose]() {
await promisify(this[kOriginalClose])();
await promisify2(this[kOriginalClose])();
this[kConnected] = 0;
this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
}
Expand All @@ -11498,7 +11498,7 @@ var require_mock_client = __commonJS({
var require_mock_pool = __commonJS({
"../node_modules/undici/lib/mock/mock-pool.js"(exports2, module2) {
"use strict";
var { promisify } = require("util");
var { promisify: promisify2 } = require("util");
var Pool = require_pool();
var { buildMockDispatch } = require_mock_utils();
var {
Expand Down Expand Up @@ -11541,7 +11541,7 @@ var require_mock_pool = __commonJS({
return new MockInterceptor(opts, this[kDispatches]);
}
async [kClose]() {
await promisify(this[kOriginalClose])();
await promisify2(this[kOriginalClose])();
this[kConnected] = 0;
this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
}
Expand Down Expand Up @@ -34331,17 +34331,18 @@ function validateBranchName(branchName) {
return branchName;
}
async function getFilePathsRecursively(dir) {
const list = await import_promises.default.readdir(dir);
const list = await readdir2(dir);
const statPromises = list.map(async (file) => {
const fullPath = import_path.default.resolve(dir, file);
const stat = await import_promises.default.stat(fullPath);
if (stat && stat.isDirectory()) {
const statPromise = await stat2(fullPath);
if (statPromise && statPromise.isDirectory()) {
return getFilePathsRecursively(fullPath);
}
return fullPath;
return [fullPath];
});
return (await Promise.all(statPromises)).flat(
Number.POSITIVE_INFINITY
return (await Promise.all(statPromises)).reduce(
(acc, val) => acc.concat(val),
[]
);
}
async function createZipFromFolder(dir) {
Expand All @@ -34357,22 +34358,25 @@ async function createZipFromFolder(dir) {
return zip;
}
async function compressFolder(srcDir, destFile) {
await import_promises.default.mkdir(import_path.default.dirname(destFile), { recursive: true });
await mkdir2(import_path.default.dirname(destFile), { recursive: true });
const zip = await createZipFromFolder(srcDir);
await new Promise((resolve, reject) => {
zip.generateNodeStream({ streamFiles: true, compression: "DEFLATE" }).pipe(fs.createWriteStream(destFile)).on("error", (err) => reject(err)).on("finish", resolve);
});
}
var import_crypto4, fs, import_path, import_promises, import_jszip, SUPPORTED_PLATFORMS, SUPPORTED_ARCHS, FAIL_THRESHOLD_OUTPUT, QODANA_SARIF_NAME, QODANA_SHORT_SARIF_NAME, QODANA_REPORT_URL_NAME, QODANA_OPEN_IN_IDE_NAME, QODANA_LICENSES_MD, QODANA_LICENSES_JSON, EXECUTABLE, VERSION, COVERAGE_THRESHOLD, QodanaExitCode, NONE, BRANCH, PULL_REQUEST;
var import_crypto4, fs, import_path, import_jszip, import_util, readdir2, stat2, mkdir2, SUPPORTED_PLATFORMS, SUPPORTED_ARCHS, FAIL_THRESHOLD_OUTPUT, QODANA_SARIF_NAME, QODANA_SHORT_SARIF_NAME, QODANA_REPORT_URL_NAME, QODANA_OPEN_IN_IDE_NAME, QODANA_LICENSES_MD, QODANA_LICENSES_JSON, EXECUTABLE, VERSION, COVERAGE_THRESHOLD, QodanaExitCode, NONE, BRANCH, PULL_REQUEST;
var init_qodana = __esm({
"../common/qodana.ts"() {
"use strict";
init_cli();
import_crypto4 = require("crypto");
fs = __toESM(require("fs"));
import_path = __toESM(require("path"));
import_promises = __toESM(require("fs/promises"));
import_jszip = __toESM(require_lib4());
import_util = require("util");
readdir2 = (0, import_util.promisify)(fs.readdir);
stat2 = (0, import_util.promisify)(fs.stat);
mkdir2 = (0, import_util.promisify)(fs.mkdir);
SUPPORTED_PLATFORMS = ["windows", "linux", "darwin"];
SUPPORTED_ARCHS = ["x86_64", "arm64"];
FAIL_THRESHOLD_OUTPUT = "The number of problems exceeds the failThreshold";
Expand Down Expand Up @@ -55429,13 +55433,13 @@ var require_form_data = __commonJS({
if (value.end != void 0 && value.end != Infinity && value.start != void 0) {
callback(null, value.end + 1 - (value.start ? value.start : 0));
} else {
fs2.stat(value.path, function(err, stat) {
fs2.stat(value.path, function(err, stat3) {
var fileSize;
if (err) {
callback(err);
return;
}
fileSize = stat.size - (value.start ? value.start : 0);
fileSize = stat3.size - (value.start ? value.start : 0);
callback(null, fileSize);
});
}
Expand Down Expand Up @@ -103008,7 +103012,7 @@ var require_readdir_glob = __commonJS({
var { EventEmitter } = require("events");
var { Minimatch } = require_minimatch2();
var { resolve } = require("path");
function readdir(dir, strict) {
function readdir3(dir, strict) {
return new Promise((resolve2, reject) => {
fs2.readdir(dir, { withFileTypes: true }, (err, files) => {
if (err) {
Expand Down Expand Up @@ -103037,16 +103041,16 @@ var require_readdir_glob = __commonJS({
});
});
}
__name(readdir, "readdir");
function stat(file, followSymlinks) {
__name(readdir3, "readdir");
function stat3(file, followSymlinks) {
return new Promise((resolve2, reject) => {
const statFunc = followSymlinks ? fs2.stat : fs2.lstat;
statFunc(file, (err, stats) => {
if (err) {
switch (err.code) {
case "ENOENT":
if (followSymlinks) {
resolve2(stat(file, false));
resolve2(stat3(file, false));
} else {
resolve2(null);
}
Expand All @@ -103061,9 +103065,9 @@ var require_readdir_glob = __commonJS({
});
});
}
__name(stat, "stat");
__name(stat3, "stat");
async function* exploreWalkAsync(dir, path2, followSymlinks, useStat, shouldSkip, strict) {
let files = await readdir(path2 + dir, strict);
let files = await readdir3(path2 + dir, strict);
for (const file of files) {
let name = file.name;
if (name === void 0) {
Expand All @@ -103075,7 +103079,7 @@ var require_readdir_glob = __commonJS({
const absolute = path2 + "/" + relative;
let stats = null;
if (useStat || followSymlinks) {
stats = await stat(absolute, followSymlinks);
stats = await stat3(absolute, followSymlinks);
}
if (!stats && file.name !== void 0) {
stats = file;
Expand Down Expand Up @@ -105835,9 +105839,9 @@ var require_graceful_fs = __commonJS({
}
__name(copyFile, "copyFile");
var fs$readdir = fs3.readdir;
fs3.readdir = readdir;
fs3.readdir = readdir3;
var noReaddirOptionVersions = /^v[0-5]\./;
function readdir(path2, options, cb) {
function readdir3(path2, options, cb) {
if (typeof options === "function")
cb = options, options = null;
var go$readdir = noReaddirOptionVersions.test(process.version) ? /* @__PURE__ */ __name(function go$readdir2(path3, options2, cb2, startTime) {
Expand Down Expand Up @@ -105876,7 +105880,7 @@ var require_graceful_fs = __commonJS({
}
__name(fs$readdirCallback, "fs$readdirCallback");
}
__name(readdir, "readdir");
__name(readdir3, "readdir");
if (process.version.substr(0, 4) === "v0.8") {
var legStreams = legacy(fs3);
ReadStream = legStreams.ReadStream;
Expand Down Expand Up @@ -131918,8 +131922,8 @@ var require_mkdirp = __commonJS({
});
break;
default:
xfs.stat(p, function(er2, stat) {
if (er2 || !stat.isDirectory()) cb(er, made);
xfs.stat(p, function(er2, stat3) {
if (er2 || !stat3.isDirectory()) cb(er, made);
else cb(null, made);
});
break;
Expand Down Expand Up @@ -131948,13 +131952,13 @@ var require_mkdirp = __commonJS({
sync(p, opts, made);
break;
default:
var stat;
var stat3;
try {
stat = xfs.statSync(p);
stat3 = xfs.statSync(p);
} catch (err1) {
throw err0;
}
if (!stat.isDirectory()) throw err0;
if (!stat3.isDirectory()) throw err0;
break;
}
}
Expand Down
22 changes: 13 additions & 9 deletions vsts/QodanaScan/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9920,17 +9920,18 @@ function validateBranchName(branchName) {
return branchName;
}
async function getFilePathsRecursively(dir) {
const list = await import_promises.default.readdir(dir);
const list = await readdir2(dir);
const statPromises = list.map(async (file) => {
const fullPath = import_path.default.resolve(dir, file);
const stat = await import_promises.default.stat(fullPath);
if (stat && stat.isDirectory()) {
const statPromise = await stat2(fullPath);
if (statPromise && statPromise.isDirectory()) {
return getFilePathsRecursively(fullPath);
}
return fullPath;
return [fullPath];
});
return (await Promise.all(statPromises)).flat(
Number.POSITIVE_INFINITY
return (await Promise.all(statPromises)).reduce(
(acc, val) => acc.concat(val),
[]
);
}
async function createZipFromFolder(dir) {
Expand All @@ -9946,22 +9947,25 @@ async function createZipFromFolder(dir) {
return zip;
}
async function compressFolder(srcDir, destFile) {
await import_promises.default.mkdir(import_path.default.dirname(destFile), { recursive: true });
await mkdir2(import_path.default.dirname(destFile), { recursive: true });
const zip = await createZipFromFolder(srcDir);
await new Promise((resolve, reject) => {
zip.generateNodeStream({ streamFiles: true, compression: "DEFLATE" }).pipe(fs.createWriteStream(destFile)).on("error", (err) => reject(err)).on("finish", resolve);
});
}
var import_crypto, fs, import_path, import_promises, import_jszip, SUPPORTED_PLATFORMS, SUPPORTED_ARCHS, FAIL_THRESHOLD_OUTPUT, QODANA_SARIF_NAME, QODANA_SHORT_SARIF_NAME, QODANA_REPORT_URL_NAME, QODANA_OPEN_IN_IDE_NAME, QODANA_LICENSES_MD, QODANA_LICENSES_JSON, EXECUTABLE, VERSION, COVERAGE_THRESHOLD, QodanaExitCode, NONE, BRANCH, PULL_REQUEST;
var import_crypto, fs, import_path, import_jszip, import_util, readdir2, stat2, mkdir2, SUPPORTED_PLATFORMS, SUPPORTED_ARCHS, FAIL_THRESHOLD_OUTPUT, QODANA_SARIF_NAME, QODANA_SHORT_SARIF_NAME, QODANA_REPORT_URL_NAME, QODANA_OPEN_IN_IDE_NAME, QODANA_LICENSES_MD, QODANA_LICENSES_JSON, EXECUTABLE, VERSION, COVERAGE_THRESHOLD, QodanaExitCode, NONE, BRANCH, PULL_REQUEST;
var init_qodana = __esm({
"../common/qodana.ts"() {
"use strict";
init_cli();
import_crypto = require("crypto");
fs = __toESM(require("fs"));
import_path = __toESM(require("path"));
import_promises = __toESM(require("fs/promises"));
import_jszip = __toESM(require_lib3());
import_util = require("util");
readdir2 = (0, import_util.promisify)(fs.readdir);
stat2 = (0, import_util.promisify)(fs.stat);
mkdir2 = (0, import_util.promisify)(fs.mkdir);
SUPPORTED_PLATFORMS = ["windows", "linux", "darwin"];
SUPPORTED_ARCHS = ["x86_64", "arm64"];
FAIL_THRESHOLD_OUTPUT = "The number of problems exceeds the failThreshold";
Expand Down
2 changes: 1 addition & 1 deletion vsts/QodanaScan/task.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 2024,
"Minor": 1,
"Patch": 9
"Patch": 10
},
"instanceNameFormat": "Qodana Scan",
"inputs": [
Expand Down
2 changes: 1 addition & 1 deletion vsts/vss-extension.dev.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifestVersion": 1,
"id": "qodana-dev",
"name": "Qodana (Dev)",
"version": "2024.1.114",
"version": "2024.1.118",
"publisher": "JetBrains",
"targets": [
{
Expand Down

0 comments on commit e17505b

Please sign in to comment.