From 78dbcaa3020e7af1ef27b33f171a1122ba0cc668 Mon Sep 17 00:00:00 2001 From: Adam Reynolds Date: Thu, 7 Nov 2024 14:02:27 -0800 Subject: [PATCH] Actually bump the dependency version --- node_modules/.package-lock.json | 6 ++--- .../msdo-client.js | 27 ++++++++++--------- .../package.json | 2 +- package-lock.json | 14 +++++----- package.json | 2 +- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index cba19a8..3d2207b 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -31,9 +31,9 @@ "license": "MIT" }, "node_modules/@microsoft/security-devops-actions-toolkit": { - "version": "1.10.0", - "resolved": "https://npm.pkg.github.com/download/@microsoft/security-devops-actions-toolkit/1.10.0/f22bf01b5f678e9b9ed9965d45d9889fb39b1dd9", - "integrity": "sha512-jOJ3FlqgHdcBzEcoxb039h8+W+mGp0xwV/HMA8gx1TlCzR4kGCOfYyJUlAtGFoiU9slDMDE3EbziDszAF1+L5Q==", + "version": "1.11.0", + "resolved": "https://npm.pkg.github.com/download/@microsoft/security-devops-actions-toolkit/1.11.0/04fef883382f5a7c9b9ac2015dcc419009e2a858", + "integrity": "sha512-dcuMhkEa8uqVpsT05E/nSMfBRtKzEhiQ/KFqEbTd5sAs7ChVP+Ke+ZMEgw4gP4LdA2cO7mH7VTfJ8xxlmwEwUw==", "license": "MIT", "dependencies": { "@actions/core": "1.10.0", diff --git a/node_modules/@microsoft/security-devops-actions-toolkit/msdo-client.js b/node_modules/@microsoft/security-devops-actions-toolkit/msdo-client.js index 821e2c1..f08baae 100644 --- a/node_modules/@microsoft/security-devops-actions-toolkit/msdo-client.js +++ b/node_modules/@microsoft/security-devops-actions-toolkit/msdo-client.js @@ -97,27 +97,30 @@ function run(inputArgs, telemetryEnvironment = 'github') { yield init(); cliFilePath = process.env.MSDO_FILEPATH; core.debug(`cliFilePath = ${cliFilePath}`); - if (inputArgs != null) { + if (inputArgs != null && inputArgs.length != 0) { for (let i = 0; i < inputArgs.length; i++) { args.push(inputArgs[i]); } } - args.push('--not-break-on-detections'); if (core.isDebug()) { args.push('--logger-level'); args.push('trace'); } - let sarifFile = path.join(process.env.GITHUB_WORKSPACE, '.gdn', 'msdo.sarif'); - core.debug(`sarifFile = ${sarifFile}`); - core.exportVariable('MSDO_SARIF_FILE', sarifFile); - core.setOutput('sarifFile', sarifFile); - if (common.isVersionGreaterThanOrEqualTo(process.env.MSDO_INSTALLEDVERSION, '0.183.0')) { - args.push('--export-file'); - } - else { - args.push('--export-breaking-results-to-file'); + let isUploadExisting = inputArgs[0] == "upload"; + if (!isUploadExisting) { + args.push('--not-break-on-detections'); + let sarifFile = path.join(process.env.GITHUB_WORKSPACE, '.gdn', 'msdo.sarif'); + core.debug(`sarifFile = ${sarifFile}`); + core.exportVariable('MSDO_SARIF_FILE', sarifFile); + core.setOutput('sarifFile', sarifFile); + if (common.isVersionGreaterThanOrEqualTo(process.env.MSDO_INSTALLEDVERSION, '0.183.0')) { + args.push('--export-file'); + } + else { + args.push('--export-breaking-results-to-file'); + } + args.push(sarifFile); } - args.push(sarifFile); args.push('--telemetry-environment'); args.push(telemetryEnvironment); core.debug(`GdnDebugDrop = ${debugDrop}`); diff --git a/node_modules/@microsoft/security-devops-actions-toolkit/package.json b/node_modules/@microsoft/security-devops-actions-toolkit/package.json index d60e82e..a621b3e 100644 --- a/node_modules/@microsoft/security-devops-actions-toolkit/package.json +++ b/node_modules/@microsoft/security-devops-actions-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/security-devops-actions-toolkit", - "version": "1.10.0", + "version": "1.11.0", "description": "Microsoft Security DevOps for GitHub Actions toolkit.", "author": "Microsoft Corporation", "license": "MIT", diff --git a/package-lock.json b/package-lock.json index f6a2b92..e5854f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@actions/core": "1.10.0", "@actions/exec": "1.1.1", - "@microsoft/security-devops-actions-toolkit": "1.10.0" + "@microsoft/security-devops-actions-toolkit": "1.11.0" }, "devDependencies": { "@types/mocha": "^2.2.44", @@ -55,9 +55,9 @@ "license": "MIT" }, "node_modules/@microsoft/security-devops-actions-toolkit": { - "version": "1.10.0", - "resolved": "https://npm.pkg.github.com/download/@microsoft/security-devops-actions-toolkit/1.10.0/f22bf01b5f678e9b9ed9965d45d9889fb39b1dd9", - "integrity": "sha512-jOJ3FlqgHdcBzEcoxb039h8+W+mGp0xwV/HMA8gx1TlCzR4kGCOfYyJUlAtGFoiU9slDMDE3EbziDszAF1+L5Q==", + "version": "1.11.0", + "resolved": "https://npm.pkg.github.com/download/@microsoft/security-devops-actions-toolkit/1.11.0/04fef883382f5a7c9b9ac2015dcc419009e2a858", + "integrity": "sha512-dcuMhkEa8uqVpsT05E/nSMfBRtKzEhiQ/KFqEbTd5sAs7ChVP+Ke+ZMEgw4gP4LdA2cO7mH7VTfJ8xxlmwEwUw==", "license": "MIT", "dependencies": { "@actions/core": "1.10.0", @@ -5494,9 +5494,9 @@ "version": "1.0.2" }, "@microsoft/security-devops-actions-toolkit": { - "version": "1.10.0", - "resolved": "https://npm.pkg.github.com/download/@microsoft/security-devops-actions-toolkit/1.10.0/f22bf01b5f678e9b9ed9965d45d9889fb39b1dd9", - "integrity": "sha512-jOJ3FlqgHdcBzEcoxb039h8+W+mGp0xwV/HMA8gx1TlCzR4kGCOfYyJUlAtGFoiU9slDMDE3EbziDszAF1+L5Q==", + "version": "1.11.0", + "resolved": "https://npm.pkg.github.com/download/@microsoft/security-devops-actions-toolkit/1.11.0/04fef883382f5a7c9b9ac2015dcc419009e2a858", + "integrity": "sha512-dcuMhkEa8uqVpsT05E/nSMfBRtKzEhiQ/KFqEbTd5sAs7ChVP+Ke+ZMEgw4gP4LdA2cO7mH7VTfJ8xxlmwEwUw==", "requires": { "@actions/core": "1.10.0", "@actions/exec": "1.1.1", diff --git a/package.json b/package.json index 1d2994f..0de9e27 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dependencies": { "@actions/core": "1.10.0", "@actions/exec": "1.1.1", - "@microsoft/security-devops-actions-toolkit": "1.10.0" + "@microsoft/security-devops-actions-toolkit": "1.11.0" }, "devDependencies": { "@types/mocha": "^2.2.44",