From f21cf0bbd70a0b319d33ec5c58541cb691ade920 Mon Sep 17 00:00:00 2001 From: "Fotis Koutoulakis (@NlightNFotis)" Date: Mon, 31 Mar 2025 12:22:18 +0100 Subject: [PATCH] feat: reclassify InvalidSarifUploadError as a user-error when final status report is produced --- lib/status-report.js | 7 ++++++- lib/status-report.js.map | 2 +- lib/status-report.test.js | 2 ++ lib/status-report.test.js.map | 2 +- src/status-report.test.ts | 9 +++++++++ src/status-report.ts | 10 +++++++++- 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/status-report.js b/lib/status-report.js index 88857c36f..2a33fb0c9 100644 --- a/lib/status-report.js +++ b/lib/status-report.js @@ -47,6 +47,7 @@ const doc_url_1 = require("./doc-url"); const environment_1 = require("./environment"); const git_utils_1 = require("./git-utils"); const repository_1 = require("./repository"); +const upload_lib_1 = require("./upload-lib"); const util_1 = require("./util"); var ActionName; (function (ActionName) { @@ -81,7 +82,11 @@ var JobStatus; })(JobStatus || (exports.JobStatus = JobStatus = {})); function getActionsStatus(error, otherFailureCause) { if (error || otherFailureCause) { - return error instanceof util_1.ConfigurationError ? "user-error" : "failure"; + if (error instanceof util_1.ConfigurationError || + error instanceof upload_lib_1.InvalidSarifUploadError) { + return "user-error"; + } + return "failure"; } else { return "success"; diff --git a/lib/status-report.js.map b/lib/status-report.js.map index 9d045c897..787ef1057 100644 --- a/lib/status-report.js.map +++ b/lib/status-report.js.map @@ -1 +1 @@ -{"version":3,"file":"status-report.js","sourceRoot":"","sources":["../src/status-report.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"status-report.js","sourceRoot":"","sources":["../src/status-report.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/status-report.test.js b/lib/status-report.test.js index 6e2b0a738..5cde1ceb0 100644 --- a/lib/status-report.test.js +++ b/lib/status-report.test.js @@ -44,6 +44,7 @@ const languages_1 = require("./languages"); const logging_1 = require("./logging"); const status_report_1 = require("./status-report"); const testing_utils_1 = require("./testing-utils"); +const upload_lib_1 = require("./upload-lib"); const util_1 = require("./util"); (0, testing_utils_1.setupTests)(ava_1.default); function setupEnvironmentAndStub(tmpDir) { @@ -118,5 +119,6 @@ function setupEnvironmentAndStub(tmpDir) { t.is((0, status_report_1.getActionsStatus)(new Object()), "failure", "getActionsStatus should return failure if passed an arbitrary object"); t.is((0, status_report_1.getActionsStatus)(null, "an error occurred"), "failure", "getActionsStatus should return failure if passed null and an additional failure cause"); t.is((0, status_report_1.getActionsStatus)((0, util_1.wrapError)(new util_1.ConfigurationError("arbitrary error"))), "user-error", "We still recognise a wrapped ConfigurationError as a user error"); + t.is((0, status_report_1.getActionsStatus)(new upload_lib_1.InvalidSarifUploadError("SyntaxError: Unexpected end of JSON input")), "user-error", "We recognise an InvalidSarifUploadError as a user error"); }); //# sourceMappingURL=status-report.test.js.map \ No newline at end of file diff --git a/lib/status-report.test.js.map b/lib/status-report.test.js.map index f0db0a158..56091404f 100644 --- a/lib/status-report.test.js.map +++ b/lib/status-report.test.js.map @@ -1 +1 @@ -{"version":3,"file":"status-report.test.js","sourceRoot":"","sources":["../src/status-report.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"status-report.test.js","sourceRoot":"","sources":["../src/status-report.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,6CAA+B;AAE/B,4DAA8C;AAC9C,+CAAuC;AACvC,2CAAuC;AACvC,uCAA4C;AAC5C,mDAIyB;AACzB,mDAIyB;AACzB,6CAAuD;AACvD,iCAA8E;AAE9E,IAAA,0BAAU,EAAC,aAAI,CAAC,CAAC;AAEjB,SAAS,uBAAuB,CAAC,MAAc;IAC7C,IAAA,gCAAgB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,GAAG,cAAc,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,SAAS,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,iBAAiB,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,oBAAoB,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,GAAG,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;IACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;IAEpC,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IACrE,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC/D,CAAC;AAED,IAAA,aAAI,EAAC,wBAAwB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACzC,MAAM,IAAA,iBAAU,EAAC,KAAK,EAAE,MAAc,EAAE,EAAE;QACxC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEhC,MAAM,YAAY,GAAG,MAAM,IAAA,sCAAsB,EAC/C,0BAAU,CAAC,IAAI,EACf,SAAS,EACT,IAAI,IAAI,CAAC,uBAAuB,CAAC,EACjC,IAAA,gCAAgB,EAAC;YACf,SAAS,EAAE,gBAAS,CAAC,IAAI;YACzB,SAAS,EAAE,CAAC,oBAAQ,CAAC,IAAI,EAAE,oBAAQ,CAAC,KAAK,CAAC;SAC3C,CAAC,EACF,EAAE,iBAAiB,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,EAC9C,IAAA,yBAAe,EAAC,KAAK,CAAC,EACtB,eAAe,EACf,uBAAuB,CACxB,CAAC;QACF,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAEvB,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,0BAAU,CAAC,IAAI,CAAC,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC,OAAO,YAAY,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;YACnD,CAAC,CAAC,EAAE,CACF,YAAY,CAAC,iBAAiB,EAC9B,IAAI,IAAI,CAAC,uBAAuB,CAAC,CAAC,WAAW,EAAE,CAChD,CAAC;YACF,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;YACjD,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,gBAAS,CAAC,IAAI,CAAC,CAAC;YAC9C,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YAC1C,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,CAAC;YAC1D,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;YACtD,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7D,CAAC,CAAC,EAAE,CAAC,OAAO,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YACjD,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YAC3C,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,CAAC;YACnD,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;YAC1D,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;YACrE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,CAAC;YACxD,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAM,CAAC,mBAAmB,CAAE,CAAC,CAAC;YACxE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACrC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;YACvE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,mCAAmC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACpD,MAAM,IAAA,iBAAU,EAAC,KAAK,EAAE,MAAc,EAAE,EAAE;QACxC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEhC,CAAC,CAAC,EAAE,CACF,CACE,MAAM,IAAA,sCAAsB,EAC1B,0BAAU,CAAC,WAAW,EACtB,SAAS,EACT,IAAI,IAAI,CAAC,uBAAuB,CAAC,EACjC,IAAA,gCAAgB,EAAC,EAAE,CAAC,EACpB,EAAE,iBAAiB,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,EAC9C,IAAA,yBAAe,EAAC,KAAK,CAAC,EACtB,eAAe,EACf,uBAAuB,CACxB,CACF,EAAE,oBAAoB,EACvB,KAAK,CACN,CAAC;QAEF,CAAC,CAAC,EAAE,CACF,CACE,MAAM,IAAA,sCAAsB,EAC1B,0BAAU,CAAC,SAAS,EACpB,SAAS,EACT,IAAI,IAAI,CAAC,uBAAuB,CAAC,EACjC,IAAA,gCAAgB,EAAC,EAAE,CAAC,EACpB,EAAE,iBAAiB,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,EAC9C,IAAA,yBAAe,EAAC,KAAK,CAAC,EACtB,eAAe,EACf,uBAAuB,CACxB,CACF,EAAE,oBAAoB,EACvB,IAAI,CACL,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,GAAG,QAAQ,CAAC;QACrD,CAAC,CAAC,EAAE,CACF,CACE,MAAM,IAAA,sCAAsB,EAC1B,0BAAU,CAAC,WAAW,EACtB,SAAS,EACT,IAAI,IAAI,CAAC,uBAAuB,CAAC,EACjC,IAAA,gCAAgB,EAAC,EAAE,CAAC,EACpB,EAAE,iBAAiB,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,EAC9C,IAAA,yBAAe,EAAC,KAAK,CAAC,EACtB,eAAe,EACf,uBAAuB,CACxB,CACF,EAAE,oBAAoB,EACvB,KAAK,CACN,CAAC;QAEF,CAAC,CAAC,EAAE,CACF,CACE,MAAM,IAAA,sCAAsB,EAC1B,0BAAU,CAAC,IAAI,EACf,SAAS,EACT,IAAI,IAAI,CAAC,uBAAuB,CAAC,EACjC,IAAA,gCAAgB,EAAC,EAAE,CAAC,EACpB,EAAE,iBAAiB,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,EAC9C,IAAA,yBAAe,EAAC,KAAK,CAAC,EACtB,eAAe,EACf,uBAAuB,CACxB,CACF,EAAE,oBAAoB,EACvB,IAAI,CACL,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,GAAG,MAAM,CAAC;QACnD,CAAC,CAAC,EAAE,CACF,CACE,MAAM,IAAA,sCAAsB,EAC1B,0BAAU,CAAC,WAAW,EACtB,SAAS,EACT,IAAI,IAAI,CAAC,uBAAuB,CAAC,EACjC,IAAA,gCAAgB,EAAC,EAAE,CAAC,EACpB,EAAE,iBAAiB,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,EAC9C,IAAA,yBAAe,EAAC,KAAK,CAAC,EACtB,eAAe,EACf,uBAAuB,CACxB,CACF,EAAE,oBAAoB,EACvB,IAAI,CACL,CAAC;QAEF,CAAC,CAAC,EAAE,CACF,CACE,MAAM,IAAA,sCAAsB,EAC1B,0BAAU,CAAC,OAAO,EAClB,SAAS,EACT,IAAI,IAAI,CAAC,uBAAuB,CAAC,EACjC,IAAA,gCAAgB,EAAC,EAAE,CAAC,EACpB,EAAE,iBAAiB,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,EAC9C,IAAA,yBAAe,EAAC,KAAK,CAAC,EACtB,eAAe,EACf,uBAAuB,CACxB,CACF,EAAE,oBAAoB,EACvB,IAAI,CACL,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,4DAA4D,EAAE,CAAC,CAAC,EAAE,EAAE;IACvE,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,EAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,EAC9C,SAAS,EACT,+CAA+C,CAChD,CAAC;IAEF,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,EAAC,IAAI,yBAAkB,CAAC,iBAAiB,CAAC,CAAC,EAC3D,YAAY,EACZ,oDAAoD,CACrD,CAAC;IAEF,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,EAAC,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,4BAA4B,CAAC,EACxE,SAAS,EACT,qGAAqG,CACtG,CAAC;IAEF,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,EACd,IAAI,yBAAkB,CAAC,aAAa,CAAC,EACrC,4BAA4B,CAC7B,EACD,YAAY,EACZ,2GAA2G,CAC5G,CAAC;IAEF,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,GAAE,EAClB,SAAS,EACT,8DAA8D,CAC/D,CAAC;IAEF,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,EAAC,IAAI,MAAM,EAAE,CAAC,EAC9B,SAAS,EACT,sEAAsE,CACvE,CAAC;IAEF,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,EAAC,IAAI,EAAE,mBAAmB,CAAC,EAC3C,SAAS,EACT,uFAAuF,CACxF,CAAC;IAEF,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,EAAC,IAAA,gBAAS,EAAC,IAAI,yBAAkB,CAAC,iBAAiB,CAAC,CAAC,CAAC,EACtE,YAAY,EACZ,iEAAiE,CAClE,CAAC;IAEF,CAAC,CAAC,EAAE,CACF,IAAA,gCAAgB,EACd,IAAI,oCAAuB,CAAC,2CAA2C,CAAC,CACzE,EACD,YAAY,EACZ,yDAAyD,CAC1D,CAAC;AACJ,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/src/status-report.test.ts b/src/status-report.test.ts index aa56b193c..cd3dceaa3 100644 --- a/src/status-report.test.ts +++ b/src/status-report.test.ts @@ -15,6 +15,7 @@ import { setupActionsVars, createTestConfig, } from "./testing-utils"; +import { InvalidSarifUploadError } from "./upload-lib"; import { BuildMode, ConfigurationError, withTmpDir, wrapError } from "./util"; setupTests(test); @@ -242,4 +243,12 @@ test("getActionStatus handling correctly various types of errors", (t) => { "user-error", "We still recognise a wrapped ConfigurationError as a user error", ); + + t.is( + getActionsStatus( + new InvalidSarifUploadError("SyntaxError: Unexpected end of JSON input"), + ), + "user-error", + "We recognise an InvalidSarifUploadError as a user error", + ); }); diff --git a/src/status-report.ts b/src/status-report.ts index 832367c61..74b6aeb86 100644 --- a/src/status-report.ts +++ b/src/status-report.ts @@ -18,6 +18,7 @@ import { EnvVar } from "./environment"; import { getRef } from "./git-utils"; import { Logger } from "./logging"; import { getRepositoryNwo } from "./repository"; +import { InvalidSarifUploadError } from "./upload-lib"; import { ConfigurationError, isHTTPError, @@ -173,7 +174,14 @@ export function getActionsStatus( otherFailureCause?: string, ): ActionStatus { if (error || otherFailureCause) { - return error instanceof ConfigurationError ? "user-error" : "failure"; + if ( + error instanceof ConfigurationError || + error instanceof InvalidSarifUploadError + ) { + return "user-error"; + } + + return "failure"; } else { return "success"; }