From 32fba70d1b0e2d19bcee7740f013c562d93207d4 Mon Sep 17 00:00:00 2001 From: David Knise Date: Thu, 22 Jun 2023 14:27:02 -0700 Subject: [PATCH 1/6] v1.7.2 - fix node10 and best effort gzip decompression --- package-lock.json | 5 +++-- package.json | 6 +++++- src/msdo-nuget-client.ts | 10 +++++++--- tsconfig.json | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90a9303..e305632 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.7.0", + "version": "1.7.2-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.7.0", + "version": "1.7.2-beta.1", "license": "MIT", "dependencies": { "@actions/core": "1.10.0", @@ -18,6 +18,7 @@ "@types/node": "^20.3.1", "del": "^7.0.0", "gulp": "^4.0.2", + "gulp-cli": "^2.3.0", "gulp-shell": "^0.8.0", "gulp-typescript": "^6.0.0-alpha.1", "typescript": "^5.1.3" diff --git a/package.json b/package.json index b566d75..b407e53 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,14 @@ { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.7.0", + "version": "1.7.2-beta.1", "description": "Microsoft Security DevOps for GitHub Actions toolkit.", "author": "Microsoft Corporation", "license": "MIT", "repository": "https://github.com/microsoft/security-devops-actions-toolkit.git", "homepage": "https://github.com/microsoft/security-devops-actions-toolkit", + "scripts": { + "build": "npx gulp" + }, "dependencies": { "@actions/core": "1.10.0", "@actions/exec": "1.1.1", @@ -16,6 +19,7 @@ "@types/node": "^20.3.1", "del": "^7.0.0", "gulp": "^4.0.2", + "gulp-cli": "^2.3.0", "gulp-shell": "^0.8.0", "gulp-typescript": "^6.0.0-alpha.1", "typescript": "^5.1.3" diff --git a/src/msdo-nuget-client.ts b/src/msdo-nuget-client.ts index 733e545..1eca422 100644 --- a/src/msdo-nuget-client.ts +++ b/src/msdo-nuget-client.ts @@ -532,9 +532,13 @@ async function requestJson(url: string, options: Object): Promise { return new Promise((resolve, reject) => { core.debug(`${options['method'].toUpperCase()} ${url}`); const req = https.request(url, options, async (res) => { - // decompress the response if it's gzipped - const decompressResponse = await import('decompress-response'); - res = decompressResponse.default(res); + // attempt to decompress the response if it's gzipped + try { + const decompressResponse = await import('decompress-response'); + res = decompressResponse.default(res); + } catch (error) { + core.debug(`Failed to add response decompression: ${error.message}`); + } if (res.statusCode !== 200) { reject(new Error(`Failed to call: ${url}. Status code: ${res.statusCode}`)); diff --git a/tsconfig.json b/tsconfig.json index a9cc5b7..f83de30 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "es6", "module": "commonjs", - "moduleResolution": "node16", + "moduleResolution": "nodenext", "lib": [ "es6" ], From dec7452ef4964cf37e832d02dc3552e90a79ef27 Mon Sep 17 00:00:00 2001 From: David Knise Date: Thu, 22 Jun 2023 14:29:40 -0700 Subject: [PATCH 2/6] v1.7.2 - udpate readme for gulp build --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index faf1421..a291197 100644 --- a/README.md +++ b/README.md @@ -15,20 +15,20 @@ A GitHub Actions javascript library for running the [Microsoft Security DevOps C ### Preqrequisities: -* Install [node.js](https://nodejs.org/en) (for npm) -* Install [gulp-cli](https://www.npmjs.com/package/gulp-cli) globally: - ``` - npm install -g gulp-cli - ``` -* Install node package dependencies - ``` - npm install - ``` - -To build, simply run `gulp` in the root of the repo: -``` -gulp -``` +* Install [node.js](https://nodejs.org/en) + +### Steps + +1. Install node package dependencies + ``` + npm install + ``` +1. Run the build script defined in the `package.json` file: + ``` + npm run build + ``` + +### Build Operations The build: 1. Compiles the typescript in the `./src` directory From 4a7a371eabb81199243253df55957211949d4c69 Mon Sep 17 00:00:00 2001 From: David Knise Date: Thu, 22 Jun 2023 14:56:37 -0700 Subject: [PATCH 3/6] v1.7.2 - node resolution --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e305632..ecc6487 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.7.2-beta.1", + "version": "1.7.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.7.2-beta.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@actions/core": "1.10.0", diff --git a/package.json b/package.json index b407e53..0bc16f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.7.2-beta.1", + "version": "1.7.2", "description": "Microsoft Security DevOps for GitHub Actions toolkit.", "author": "Microsoft Corporation", "license": "MIT", From bf2b9c91d1de12c4ff0c5f321d022a717bf666eb Mon Sep 17 00:00:00 2001 From: Chris Nielsen Date: Fri, 26 Jan 2024 17:06:45 -0800 Subject: [PATCH 4/6] Fixing debug drop bug --- src/msdo-client.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msdo-client.ts b/src/msdo-client.ts index 4b2f78d..e1d8e95 100644 --- a/src/msdo-client.ts +++ b/src/msdo-client.ts @@ -87,7 +87,7 @@ async function init() { export async function run(inputArgs: string[], telemetryEnvironment: string = 'github') { let cliFilePath: string = null; let args: string[] = []; - let debugDrop = process.env.GDN_DEBUG_DROP; + let debugDrop = process.env.GDN_DEBUG_DROP?.toLowerCase(); const gdnTaskLibFolder = path.resolve(__dirname); core.debug(`gdnTaskLibFolder = ${gdnTaskLibFolder}`); @@ -145,7 +145,7 @@ export async function run(inputArgs: string[], telemetryEnvironment: string = 'g // Include the debug drop option on the command line if applicable. core.debug(`GdnDebugDrop = ${debugDrop}`); - if (debugDrop) + if (debugDrop == 'true') { args.push('--debug-drop'); args.push('--debug-drop-path'); @@ -173,7 +173,7 @@ export async function run(inputArgs: string[], telemetryEnvironment: string = 'g // Package up debug drop if applicable. let debugStagingDir = ''; core.debug(`GdnDebugDrop = ${debugDrop}`); - if (debugDrop) { + if (debugDrop == 'true') { if (fs.existsSync(debugFolder)) { core.debug("Creating debug drop archive..."); let zippedOutput = getZippedFolder(debugFolder); From 91bbdbdc1f8aaed06c366749e0ac50b73da06411 Mon Sep 17 00:00:00 2001 From: chrisnielsen-MS <110426492+chrisnielsen-MS@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:28:30 -0800 Subject: [PATCH 5/6] Use common bool parsing logic rather than compare to string (#17) --- src/msdo-client.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msdo-client.ts b/src/msdo-client.ts index e1d8e95..2be8ae5 100644 --- a/src/msdo-client.ts +++ b/src/msdo-client.ts @@ -87,7 +87,7 @@ async function init() { export async function run(inputArgs: string[], telemetryEnvironment: string = 'github') { let cliFilePath: string = null; let args: string[] = []; - let debugDrop = process.env.GDN_DEBUG_DROP?.toLowerCase(); + let debugDrop = common.parseBool(process.env.GDN_DEBUG_DROP); const gdnTaskLibFolder = path.resolve(__dirname); core.debug(`gdnTaskLibFolder = ${gdnTaskLibFolder}`); @@ -145,7 +145,7 @@ export async function run(inputArgs: string[], telemetryEnvironment: string = 'g // Include the debug drop option on the command line if applicable. core.debug(`GdnDebugDrop = ${debugDrop}`); - if (debugDrop == 'true') + if (debugDrop) { args.push('--debug-drop'); args.push('--debug-drop-path'); @@ -173,7 +173,7 @@ export async function run(inputArgs: string[], telemetryEnvironment: string = 'g // Package up debug drop if applicable. let debugStagingDir = ''; core.debug(`GdnDebugDrop = ${debugDrop}`); - if (debugDrop == 'true') { + if (debugDrop) { if (fs.existsSync(debugFolder)) { core.debug("Creating debug drop archive..."); let zippedOutput = getZippedFolder(debugFolder); From 0a68c0669fe37145b0817d8f11e49c89d315372d Mon Sep 17 00:00:00 2001 From: Chris Nielsen Date: Wed, 6 Mar 2024 16:35:00 -0800 Subject: [PATCH 6/6] Updating package version number --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2c30c79..1dfd003 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.9.1", + "version": "1.10.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.9.1", + "version": "1.10.0", "license": "MIT", "dependencies": { "@actions/core": "1.10.0", diff --git a/package.json b/package.json index b88d6e3..d60e82e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.9.1", + "version": "1.10.0", "description": "Microsoft Security DevOps for GitHub Actions toolkit.", "author": "Microsoft Corporation", "license": "MIT",