From 118c1d557c603246c36a2a219ac97b4b5398276f Mon Sep 17 00:00:00 2001 From: Vallie Joseph Date: Thu, 3 Aug 2023 16:36:11 -0400 Subject: [PATCH] Audit Fix (#1480) * fixing audit failures * replacing lerna bootstrap with npm command * audit fix for cache and tool-cache * updating tunnel * upgrading core packages * re-adding tunnel as prod dep * updating dependencies * updating exec deps * updating exec io package * . * Revert * updating packages * adding core as dep * updating learna config * updating lerna commands * Removing audit failing packages in cache + tool-cache * updating contribution bootstrap description * updating libraries * prettier lint * hiding stricter rules * updating prettier command * Removing unknown flag * Adding eslint prettier * ignoring sym links * updating ignore path * updating prettier rules * changing prettier + github ver * updating ts and ignores * Revert ts * Adding unknown ignores * downgrading lerna * . * adding nx * Adding lint auto lint rules * updating eslint ignore for glob packages * Adding subdirs to ignore * adding flag for ignore pattern in linter * Expanding ignore regex * Adding ignore rules * adding another ignore pattern to tsconfig eslint * adding ignore pattern to eslintrc * syncing package-json * updating traverse * . * test adding core and http client to base package * running npm ci * adding tsconfig paths * adding base URL * Adding explicit path to core and http-client * editing tsc call * updating artifact packages * force build * updating lock file version * updating lock file version * upgrading node version * Adding babel traverse back * fixing build issue * fixing typescript ver * updating package json * Adding ignore for artifact test * adding ignore to flags * unlink after test completes * cleanup * merge + package edit --- __tests__/retry-helper.test.ts | 6 +-- __tests__/tool-cache.test.ts | 76 +++++++++++++--------------------- package-lock.json | 48 ++++++++++----------- src/manifest.ts | 5 +-- 4 files changed, 57 insertions(+), 78 deletions(-) diff --git a/__tests__/retry-helper.test.ts b/__tests__/retry-helper.test.ts index 90b2e7c..7b110db 100644 --- a/__tests__/retry-helper.test.ts +++ b/__tests__/retry-helper.test.ts @@ -68,7 +68,7 @@ describe('retry-helper tests', () => { it('all attempts fail', async () => { let attempts = 0 - let error: Error = (null as unknown) as Error + let error: Error = null as unknown as Error try { await retryHelper.execute(() => { throw new Error(`some error ${++attempts}`) @@ -87,7 +87,7 @@ describe('retry-helper tests', () => { it('checks retryable after first attempt', async () => { let attempts = 0 - let error: Error = (null as unknown) as Error + let error: Error = null as unknown as Error try { await retryHelper.execute( async () => { @@ -105,7 +105,7 @@ describe('retry-helper tests', () => { it('checks retryable after second attempt', async () => { let attempts = 0 - let error: Error = (null as unknown) as Error + let error: Error = null as unknown as Error try { await retryHelper.execute( async () => { diff --git a/__tests__/tool-cache.test.ts b/__tests__/tool-cache.test.ts index 16c1a5b..4712ab5 100644 --- a/__tests__/tool-cache.test.ts +++ b/__tests__/tool-cache.test.ts @@ -17,31 +17,28 @@ import * as tc from '../src/tool-cache' const IS_WINDOWS = process.platform === 'win32' const IS_MAC = process.platform === 'darwin' -describe('@actions/tool-cache', function() { - beforeAll(function() { - nock('http://example.com') - .persist() - .get('/bytes/35') - .reply(200, { - username: 'abc', - password: 'def' - }) +describe('@actions/tool-cache', function () { + beforeAll(function () { + nock('http://example.com').persist().get('/bytes/35').reply(200, { + username: 'abc', + password: 'def' + }) setGlobal('TEST_DOWNLOAD_TOOL_RETRY_MIN_SECONDS', 0) setGlobal('TEST_DOWNLOAD_TOOL_RETRY_MAX_SECONDS', 0) }) - beforeEach(async function() { + beforeEach(async function () { await io.rmRF(cachePath) await io.rmRF(tempPath) await io.mkdirP(cachePath) await io.mkdirP(tempPath) }) - afterEach(function() { + afterEach(function () { setResponseMessageFactory(undefined) }) - afterAll(async function() { + afterAll(async function () { await io.rmRF(tempPath) await io.rmRF(cachePath) setGlobal('TEST_DOWNLOAD_TOOL_RETRY_MIN_SECONDS', undefined) @@ -177,13 +174,10 @@ describe('@actions/tool-cache', function() { }) it('has status code in exception dictionary for HTTP error code responses', async () => { - nock('http://example.com') - .persist() - .get('/bytes/bad') - .reply(400, { - username: 'bad', - password: 'file' - }) + nock('http://example.com').persist().get('/bytes/bad').reply(400, { + username: 'bad', + password: 'file' + }) expect.assertions(2) @@ -196,7 +190,7 @@ describe('@actions/tool-cache', function() { } }) - it('works with redirect code 302', async function() { + it('works with redirect code 302', async function () { nock('http://example.com') .persist() .get('/redirect-to') @@ -295,7 +289,7 @@ describe('@actions/tool-cache', function() { } }) - it('extract 7z using custom 7z tool', async function() { + it('extract 7z using custom 7z tool', async function () { const tempDir = path.join( __dirname, 'test-extract-7z-using-custom-7z-tool' @@ -643,7 +637,7 @@ describe('@actions/tool-cache', function() { } ) - it('installs a zip and extracts it to specified directory', async function() { + it('installs a zip and extracts it to specified directory', async function () { const tempDir = path.join(__dirname, 'test-install-zip') try { await io.mkdirP(tempDir) @@ -706,7 +700,7 @@ describe('@actions/tool-cache', function() { } }) - it('extract zip to a directory that does not exist', async function() { + it('extract zip to a directory that does not exist', async function () { const tempDir = path.join(__dirname, 'test-install-zip') try { await io.mkdirP(tempDir) @@ -762,24 +756,16 @@ describe('@actions/tool-cache', function() { } }) - it('works with a 502 temporary failure', async function() { - nock('http://example.com') - .get('/temp502') - .twice() - .reply(502, undefined) - nock('http://example.com') - .get('/temp502') - .reply(200, undefined) + it('works with a 502 temporary failure', async function () { + nock('http://example.com').get('/temp502').twice().reply(502, undefined) + nock('http://example.com').get('/temp502').reply(200, undefined) const statusCodeUrl = 'http://example.com/temp502' await tc.downloadTool(statusCodeUrl) }) - it("doesn't retry 502s more than 3 times", async function() { - nock('http://example.com') - .get('/perm502') - .times(3) - .reply(502, undefined) + it("doesn't retry 502s more than 3 times", async function () { + nock('http://example.com').get('/perm502').times(3).reply(502, undefined) expect.assertions(1) @@ -791,7 +777,7 @@ describe('@actions/tool-cache', function() { } }) - it('retries 429s', async function() { + it('retries 429s', async function () { nock('http://example.com') .get('/too-many-requests-429') .times(2) @@ -808,13 +794,9 @@ describe('@actions/tool-cache', function() { } }) - it("doesn't retry 404", async function() { - nock('http://example.com') - .get('/not-found-404') - .reply(404, undefined) - nock('http://example.com') - .get('/not-found-404') - .reply(500, undefined) + it("doesn't retry 404", async function () { + nock('http://example.com').get('/not-found-404').reply(404, undefined) + nock('http://example.com').get('/not-found-404').reply(500, undefined) try { const statusCodeUrl = 'http://example.com/not-found-404' @@ -824,7 +806,7 @@ describe('@actions/tool-cache', function() { } }) - it('supports authorization headers', async function() { + it('supports authorization headers', async function () { nock('http://example.com', { reqheaders: { authorization: 'token abc123' @@ -840,7 +822,7 @@ describe('@actions/tool-cache', function() { ) }) - it('supports custom headers', async function() { + it('supports custom headers', async function () { nock('http://example.com', { reqheaders: { accept: 'application/octet-stream' @@ -859,7 +841,7 @@ describe('@actions/tool-cache', function() { ) }) - it('supports authorization and custom headers', async function() { + it('supports authorization and custom headers', async function () { nock('http://example.com', { reqheaders: { accept: 'application/octet-stream', diff --git a/package-lock.json b/package-lock.json index f1b3709..3cdd757 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,9 +24,9 @@ } }, "node_modules/@actions/core": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz", - "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz", + "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==", "dependencies": { "@actions/http-client": "^2.0.1", "uuid": "^8.3.2" @@ -49,17 +49,17 @@ } }, "node_modules/@actions/http-client": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz", - "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz", + "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==", "dependencies": { "tunnel": "^0.0.6" } }, "node_modules/@actions/io": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz", - "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz", + "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==" }, "node_modules/@types/nock": { "version": "11.1.0", @@ -145,9 +145,9 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -172,9 +172,9 @@ }, "dependencies": { "@actions/core": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz", - "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz", + "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==", "requires": { "@actions/http-client": "^2.0.1", "uuid": "^8.3.2" @@ -196,17 +196,17 @@ } }, "@actions/http-client": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz", - "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz", + "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==", "requires": { "tunnel": "^0.0.6" } }, "@actions/io": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz", - "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz", + "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==" }, "@types/nock": { "version": "11.1.0", @@ -284,9 +284,9 @@ "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "tunnel": { "version": "0.0.6", diff --git a/src/manifest.ts b/src/manifest.ts index e52819b..7e0808f 100644 --- a/src/manifest.ts +++ b/src/manifest.ts @@ -140,10 +140,7 @@ export function _getOsVersion(): string { (parts[0].trim() === 'VERSION_ID' || parts[0].trim() === 'DISTRIB_RELEASE') ) { - version = parts[1] - .trim() - .replace(/^"/, '') - .replace(/"$/, '') + version = parts[1].trim().replace(/^"/, '').replace(/"$/, '') break } }