@appland/scanner 1.49.0 → 1.51.0

package/README.md

@@ -65,7 +65,7 @@ documentation for each rule to see it's pattern filters and other configurable p
 
 To enable de-duplication of findings, a hash is calculated for each finding. The hash is the
 `sha256` digest of a canonical content string for the finding. The canonical content string combines
-stable data from the finding, such as the rule id, normalized event, etc. See 
+stable data from the finding, such as the rule id, normalized event, etc. See
 [appmap-js/packages/models/src/event/hash.js](https://github.com/applandinc/appmap-js/blob/959a8c93c9be37d40a8f4a0e7d44ee211730641e/packages/models/src/event/hash.js)
 for details.
 
@@ -388,6 +388,12 @@ When using Appmap Scanner in CI you can post findings summary as a commit status
 yarn run scan-ci
 ```
 
+When uploading findings to [app.land](https://app.land), branch and commit information will be
+resolved from the environment if possible. If we do not yet support your CI provider or you have a
+non-standard configuration, you may provide your own overrides using the `-b` (branch) and `-c`
+(commit) options to the `upload` and `ci` commands. Note that this is only necessary when Git is in
+a detached HEAD state.
+
 ## Development
 
 ### Using a local branch of `@appland/models`

package/built/cli/ci/command.js

@@ -73,11 +73,13 @@ var scanArgs_1 = __importDefault(require("../scanArgs"));
 var updateCommitStatus_1 = __importDefault(require("../updateCommitStatus"));
 var reportUploadURL_1 = __importDefault(require("../reportUploadURL"));
 var fail_1 = __importDefault(require("../fail"));
+var codeVersionArgs_1 = __importDefault(require("../codeVersionArgs"));
 exports.default = {
     command: 'ci',
     describe: 'Scan AppMaps, report findings to AppMap Server, and update SCM status',
     builder: function (args) {
         (0, scanArgs_1.default)(args);
+        (0, codeVersionArgs_1.default)(args);
         args.option('fail', {
             describe: 'exit with non-zero status if there are any new findings',
             default: false,
@@ -100,11 +102,11 @@ exports.default = {
     },
     handler: function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, appmapDir, config, isVerbose, failOption, appIdArg, reportFile, doUpload, updateCommitStatusOption, mergeKey, glob, files, appId, configData, scanner, _b, rawScanResults, findingStatuses, scanResults, uploadResponse, err_1;
+            var _a, appmapDir, config, isVerbose, failOption, appIdArg, reportFile, doUpload, updateCommitStatusOption, mergeKey, commit, branch, environment, appId, glob, files, configData, scanner, _b, rawScanResults, findingStatuses, scanResults, uploadResponse, err_1;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = options, appmapDir = _a.appmapDir, config = _a.config, isVerbose = _a.verbose, failOption = _a.fail, appIdArg = _a.app, reportFile = _a.reportFile, doUpload = _a.upload, updateCommitStatusOption = _a.updateCommitStatus, mergeKey = _a.mergeKey;
+                        _a = options, appmapDir = _a.appmapDir, config = _a.config, isVerbose = _a.verbose, failOption = _a.fail, appIdArg = _a.app, reportFile = _a.reportFile, doUpload = _a.upload, updateCommitStatusOption = _a.updateCommitStatus, mergeKey = _a.mergeKey, commit = _a.commit, branch = _a.branch, environment = _a.environment;
                         if (isVerbose) {
                             (0, util_2.verbose)(true);
                         }
@@ -117,13 +119,13 @@ exports.default = {
                         return [4 /*yield*/, (0, validateFile_1.default)('directory', appmapDir)];
                     case 2:
                         _c.sent();
+                        return [4 /*yield*/, (0, resolveAppId_1.default)(appIdArg, appmapDir)];
+                    case 3:
+                        appId = _c.sent();
                         glob = (0, util_1.promisify)(glob_1.glob);
                         return [4 /*yield*/, glob(appmapDir + "/**/*.appmap.json")];
-                    case 3:
-                        files = _c.sent();
-                        return [4 /*yield*/, (0, resolveAppId_1.default)(appIdArg, appmapDir)];
                     case 4:
-                        appId = _c.sent();
+                        files = _c.sent();
                         return [4 /*yield*/, (0, configurationProvider_1.parseConfigFile)(config)];
                     case 5:
                         configData = _c.sent();
@@ -142,7 +144,11 @@ exports.default = {
                         (0, findingsReport_1.default)(scanResults.findings, scanResults.appMapMetadata);
                         (0, summaryReport_1.default)(scanResults, true);
                         if (!doUpload) return [3 /*break*/, 10];
-                        return [4 /*yield*/, (0, upload_1.default)(rawScanResults, appId, mergeKey, {
+                        return [4 /*yield*/, (0, upload_1.default)(rawScanResults, appId, appmapDir, mergeKey, {
+                                branch: branch,
+                                commit: commit,
+                                environment: environment,
+                            }, {
                                 maxRetries: 3,
                             })];
                     case 9:

package/built/cli/ci/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/ci/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/ci/command.ts"],"names":[],"mappings":"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"}

package/built/cli/codeVersionArgs.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function default_1(args) {
+    args.option('branch', {
+        describe: 'branch name of the code version',
+        alias: 'b',
+    });
+    args.option('commit', {
+        describe: 'commit SHA of the code version',
+        alias: 'C',
+    });
+    args.option('environment', {
+        describe: 'name of the environment in which the scan is performed (e.g. $HOSTNAME, ci, staging, etc)',
+        alias: 'e',
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=codeVersionArgs.js.map

package/built/cli/codeVersionArgs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codeVersionArgs.js","sourceRoot":"","sources":["../../src/cli/codeVersionArgs.ts"],"names":[],"mappings":";;AAEA,mBAAyB,IAAU;IACjC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,QAAQ,EAAE,iCAAiC;QAC3C,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,QAAQ,EAAE,gCAAgC;QAC1C,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,QAAQ,EACN,2FAA2F;QAC7F,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;AACL,CAAC;AAdD,4BAcC"}

package/built/cli/resolveAppId.js

@@ -40,8 +40,9 @@ var fs_1 = require("fs");
 var promises_1 = require("fs/promises");
 var js_yaml_1 = require("js-yaml");
 var path_1 = require("path");
+var exists_1 = require("../integration/appland/app/exists");
 var errors_1 = require("../errors");
-function default_1(appIdArg, appMapDir) {
+function resolveAppId(appIdArg, appMapDir) {
     return __awaiter(this, void 0, void 0, function () {
         var searchPath, configPath, _a, configContent, config;
         return __generator(this, function (_b) {
@@ -74,7 +75,28 @@ function default_1(appIdArg, appMapDir) {
                     if (config.name)
                         return [2 /*return*/, config.name];
                     return [3 /*break*/, 1];
-                case 7: throw new errors_1.ValidationError('app id was not provided and could not be resolved');
+                case 7: return [2 /*return*/];
+            }
+        });
+    });
+}
+function default_1(appIdArg, appMapDir) {
+    return __awaiter(this, void 0, void 0, function () {
+        var appId, appExists;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, resolveAppId(appIdArg, appMapDir)];
+                case 1:
+                    appId = _a.sent();
+                    if (!appId)
+                        throw new errors_1.ValidationError('App was not provided and could not be resolved');
+                    return [4 /*yield*/, (0, exists_1.exists)(appId)];
+                case 2:
+                    appExists = _a.sent();
+                    if (!appExists) {
+                        throw new errors_1.ValidationError("App \"" + appId + "\" is not valid or does not exist.\nPlease fix the app name in the appmap.yml file, or override it with the --app option.");
+                    }
+                    return [2 /*return*/, appId];
             }
         });
     });

package/built/cli/resolveAppId.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveAppId.js","sourceRoot":"","sources":["../../src/cli/resolveAppId.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAA8C;AAC9C,wCAA+C;AAC/C,mCAA+B;AAC/B,6BAA8C;AAC9C,oCAA4C;AAE5C,mBACE,QAA4B,EAC5B,SAA6B;;;;;;oBAE7B,IAAI,QAAQ,EAAE;wBACZ,sBAAO,QAAQ,EAAC;qBACjB;yBAEG,SAAS,EAAT,wBAAS;oBACP,UAAU,GAAG,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC;;;yBAC7B,CAAA,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,GAAG,CAAA;oBACvC,UAAU,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;;;;oBAGhD,qBAAM,IAAA,iBAAM,EAAC,UAAU,EAAE,cAAW,CAAC,IAAI,CAAC,EAAA;;oBAA1C,SAA0C,CAAC;;;;oBAE3C,UAAU,GAAG,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC;oBACjC,wBAAS;wBAGW,qBAAM,IAAA,mBAAQ,EAAC,UAAU,EAAE,OAAO,CAAC,EAAA;;oBAAnD,aAAa,GAAG,SAAmC;oBACnD,MAAM,GAAG,IAAA,cAAI,EAAC,aAAa,CAAsB,CAAC;oBACxD,IAAI,MAAM,CAAC,IAAI;wBAAE,sBAAO,MAAM,CAAC,IAAI,EAAC;;wBAIxC,MAAM,IAAI,wBAAe,CAAC,mDAAmD,CAAC,CAAC;;;;CAChF;AA3BD,4BA2BC"}
+{"version":3,"file":"resolveAppId.js","sourceRoot":"","sources":["../../src/cli/resolveAppId.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAA8C;AAC9C,wCAA+C;AAC/C,mCAA+B;AAC/B,6BAA8C;AAC9C,4DAA2D;AAC3D,oCAA4C;AAE5C,SAAe,YAAY,CACzB,QAA4B,EAC5B,SAA6B;;;;;;oBAE7B,IAAI,QAAQ,EAAE;wBACZ,sBAAO,QAAQ,EAAC;qBACjB;yBAEG,SAAS,EAAT,wBAAS;oBACP,UAAU,GAAG,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC;;;yBAC7B,CAAA,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,GAAG,CAAA;oBACvC,UAAU,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;;;;oBAGhD,qBAAM,IAAA,iBAAM,EAAC,UAAU,EAAE,cAAW,CAAC,IAAI,CAAC,EAAA;;oBAA1C,SAA0C,CAAC;;;;oBAE3C,UAAU,GAAG,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC;oBACjC,wBAAS;wBAGW,qBAAM,IAAA,mBAAQ,EAAC,UAAU,EAAE,OAAO,CAAC,EAAA;;oBAAnD,aAAa,GAAG,SAAmC;oBACnD,MAAM,GAAG,IAAA,cAAI,EAAC,aAAa,CAAsB,CAAC;oBACxD,IAAI,MAAM,CAAC,IAAI;wBAAE,sBAAO,MAAM,CAAC,IAAI,EAAC;;;;;;CAGzC;AAED,mBACE,QAA4B,EAC5B,SAA6B;;;;;wBAEf,qBAAM,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAA;;oBAA/C,KAAK,GAAG,SAAuC;oBACrD,IAAI,CAAC,KAAK;wBAAE,MAAM,IAAI,wBAAe,CAAC,gDAAgD,CAAC,CAAC;oBAEtE,qBAAM,IAAA,eAAM,EAAC,KAAK,CAAC,EAAA;;oBAA/B,SAAS,GAAG,SAAmB;oBACrC,IAAI,CAAC,SAAS,EAAE;wBACd,MAAM,IAAI,wBAAe,CACvB,WAAQ,KAAK,8HAA0H,CACxI,CAAC;qBACH;oBAED,sBAAO,KAAK,EAAC;;;;CACd;AAfD,4BAeC"}

package/built/cli/scan/command.js

@@ -95,10 +95,10 @@ var util_2 = require("../../rules/lib/util");
 var findings_1 = require("../../findings");
 var findingsReport_1 = __importDefault(require("../../report/findingsReport"));
 var summaryReport_1 = __importDefault(require("../../report/summaryReport"));
-var exitCode_1 = require("../exitCode");
 var validateFile_1 = __importDefault(require("../validateFile"));
 var scanner_1 = __importDefault(require("./scanner"));
 var scanArgs_1 = __importDefault(require("../scanArgs"));
+var resolveAppId_1 = __importDefault(require("../resolveAppId"));
 exports.default = {
     command: 'scan',
     describe: 'Scan AppMaps for code behavior findings',
@@ -121,7 +121,7 @@ exports.default = {
     },
     handler: function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, appmapDir, appmapFile, config, isVerbose, reportAllFindings, appIdArg, apiKey, ide, reportFile, files, glob, configData, scanner, startTime, _b, rawScanResults, findingStatuses, scanResults, elapsed, numChecks, err_1;
+            var _a, appmapDir, appmapFile, config, isVerbose, reportAllFindings, appIdArg, apiKey, ide, reportFile, appId, files, glob, configData, scanner, startTime, _b, rawScanResults, findingStatuses, scanResults, elapsed, numChecks;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -132,50 +132,53 @@ exports.default = {
                         if (apiKey) {
                             process.env.APPLAND_API_KEY = apiKey;
                         }
-                        _c.label = 1;
-                    case 1:
-                        _c.trys.push([1, 11, , 12]);
                         if (appmapFile && appmapDir) {
                             throw new errors_1.ValidationError('Use --appmap-dir or --appmap-file, but not both');
                         }
                         if (!appmapFile && !appmapDir) {
                             throw new errors_1.ValidationError('Either --appmap-dir or --appmap-file is required');
                         }
+                        appId = appIdArg;
+                        if (!!reportAllFindings) return [3 /*break*/, 2];
+                        return [4 /*yield*/, (0, resolveAppId_1.default)(appIdArg, appmapDir)];
+                    case 1:
+                        appId = _c.sent();
+                        _c.label = 2;
+                    case 2:
                         files = [];
-                        if (!appmapDir) return [3 /*break*/, 4];
+                        if (!appmapDir) return [3 /*break*/, 5];
                         return [4 /*yield*/, (0, validateFile_1.default)('directory', appmapDir)];
-                    case 2:
+                    case 3:
                         _c.sent();
                         glob = (0, util_1.promisify)(glob_1.glob);
                         return [4 /*yield*/, glob(appmapDir + "/**/*.appmap.json")];
-                    case 3:
-                        files = _c.sent();
-                        _c.label = 4;
                     case 4:
-                        if (!appmapFile) return [3 /*break*/, 6];
-                        return [4 /*yield*/, (0, validateFile_1.default)('file', appmapFile)];
+                        files = _c.sent();
+                        _c.label = 5;
                     case 5:
+                        if (!appmapFile) return [3 /*break*/, 7];
+                        return [4 /*yield*/, (0, validateFile_1.default)('file', appmapFile)];
+                    case 6:
                         _c.sent();
                         files = [appmapFile];
-                        _c.label = 6;
-                    case 6: return [4 /*yield*/, (0, configurationProvider_1.parseConfigFile)(config)];
-                    case 7:
+                        _c.label = 7;
+                    case 7: return [4 /*yield*/, (0, configurationProvider_1.parseConfigFile)(config)];
+                    case 8:
                         configData = _c.sent();
                         return [4 /*yield*/, (0, scanner_1.default)(reportAllFindings, configData, files).catch(function (error) {
                                 throw new errors_1.ValidationError(error.message + '\nUse --all to perform an offline scan.');
                             })];
-                    case 8:
+                    case 9:
                         scanner = _c.sent();
                         startTime = Date.now();
-                        return [4 /*yield*/, Promise.all([scanner.scan(), scanner.fetchFindingStatus(appIdArg, appmapDir)])];
-                    case 9:
+                        return [4 /*yield*/, Promise.all([scanner.scan(), scanner.fetchFindingStatus(appId, appmapDir)])];
+                    case 10:
                         _b = __read.apply(void 0, [_c.sent(), 2]), rawScanResults = _b[0], findingStatuses = _b[1];
                         // Always report the raw data
                         return [4 /*yield*/, (0, promises_1.writeFile)(reportFile, formatReport(rawScanResults))];
-                    case 10:
+                    case 11:
                         // Always report the raw data
                         _c.sent();
-                        scanResults = void 0;
                         if (reportAllFindings) {
                             scanResults = rawScanResults;
                         }
@@ -189,22 +192,7 @@ exports.default = {
                         elapsed = Date.now() - startTime;
                         numChecks = scanResults.checks.length * scanResults.summary.numAppMaps;
                         console.log("Performed " + numChecks + " checks in " + elapsed + "ms (" + Math.floor(numChecks / (elapsed / 1000.0)) + " checks/sec)");
-                        return [3 /*break*/, 12];
-                    case 11:
-                        err_1 = _c.sent();
-                        if (err_1 instanceof errors_1.ValidationError) {
-                            console.warn(err_1.message);
-                            return [2 /*return*/, process.exit(exitCode_1.ExitCode.ValidationError)];
-                        }
-                        if (err_1 instanceof errors_1.AbortError) {
-                            return [2 /*return*/, process.exit(exitCode_1.ExitCode.AbortError)];
-                        }
-                        if (!util_2.verbose && err_1 instanceof Error) {
-                            console.error(err_1.message);
-                            return [2 /*return*/, process.exit(exitCode_1.ExitCode.RuntimeError)];
-                        }
-                        throw err_1;
-                    case 12: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });

package/built/cli/scan/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/scan/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/scan/command.ts"],"names":[],"mappings":"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"}

package/built/cli/scanArgs.js

@@ -20,6 +20,7 @@ function default_1(args) {
     });
     args.option('app', {
         describe: 'name of the app to publish the findings for. By default, this is determined by looking in appmap.yml',
+        alias: 'a',
     });
 }
 exports.default = default_1;

package/built/cli/scanArgs.js.map

@@ -1 +1 @@
-{"version":3,"file":"scanArgs.js","sourceRoot":"","sources":["../../src/cli/scanArgs.ts"],"names":[],"mappings":";;AAAA,6BAA4B;AAG5B,mBAAyB,IAAU;IACjC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,QAAQ,EAAE,8CAA8C;QACxD,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,QAAQ,EACN,0FAA0F;QAC5F,OAAO,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,6BAA6B,CAAC;QACvD,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,QAAQ,EAAE,+BAA+B;QACzC,OAAO,EAAE,uBAAuB;KACjC,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QACrB,QAAQ,EACN,uFAAuF;KAC1F,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;QACjB,QAAQ,EACN,sGAAsG;KACzG,CAAC,CAAC;AACL,CAAC;AAvBD,4BAuBC"}
+{"version":3,"file":"scanArgs.js","sourceRoot":"","sources":["../../src/cli/scanArgs.ts"],"names":[],"mappings":";;AAAA,6BAA4B;AAG5B,mBAAyB,IAAU;IACjC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,QAAQ,EAAE,8CAA8C;QACxD,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,QAAQ,EACN,0FAA0F;QAC5F,OAAO,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,6BAA6B,CAAC;QACvD,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,QAAQ,EAAE,+BAA+B;QACzC,OAAO,EAAE,uBAAuB;KACjC,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QACrB,QAAQ,EACN,uFAAuF;KAC1F,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;QACjB,QAAQ,EACN,sGAAsG;QACxG,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;AACL,CAAC;AAxBD,4BAwBC"}

package/built/cli/upload/command.js

@@ -45,10 +45,12 @@ var validateFile_1 = __importDefault(require("../validateFile"));
 var resolveAppId_1 = __importDefault(require("../resolveAppId"));
 var reportUploadURL_1 = __importDefault(require("../reportUploadURL"));
 var upload_1 = __importDefault(require("../upload"));
+var codeVersionArgs_1 = __importDefault(require("../codeVersionArgs"));
 exports.default = {
     command: 'upload',
     describe: 'Upload Findings to the AppMap Server',
     builder: function (args) {
+        (0, codeVersionArgs_1.default)(args);
         args.option('appmap-dir', {
             describe: 'base directory of AppMaps',
             alias: 'd',
@@ -67,30 +69,28 @@ exports.default = {
     },
     handler: function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, isVerbose, reportFile, appmapDir, appIdArg, mergeKey, appId, scanResults, _b, _c, uploadResponse;
+            var _a, isVerbose, reportFile, appmapDir, appIdArg, mergeKey, branch, commit, environment, appId, scanResults, _b, _c, uploadResponse;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        _a = options, isVerbose = _a.verbose, reportFile = _a.reportFile, appmapDir = _a.appmapDir, appIdArg = _a.app, mergeKey = _a.mergeKey;
+                        _a = options, isVerbose = _a.verbose, reportFile = _a.reportFile, appmapDir = _a.appmapDir, appIdArg = _a.app, mergeKey = _a.mergeKey, branch = _a.branch, commit = _a.commit, environment = _a.environment;
                         if (isVerbose) {
                             (0, util_1.verbose)(true);
                         }
-                        if (!appmapDir) return [3 /*break*/, 2];
                         return [4 /*yield*/, (0, validateFile_1.default)('directory', appmapDir)];
                     case 1:
                         _d.sent();
-                        _d.label = 2;
-                    case 2: return [4 /*yield*/, (0, resolveAppId_1.default)(appIdArg, appmapDir)];
-                    case 3:
+                        return [4 /*yield*/, (0, resolveAppId_1.default)(appIdArg, appmapDir)];
+                    case 2:
                         appId = _d.sent();
                         _c = (_b = JSON).parse;
                         return [4 /*yield*/, (0, promises_1.readFile)(reportFile)];
-                    case 4:
+                    case 3:
                         scanResults = _c.apply(_b, [(_d.sent()).toString()]);
-                        return [4 /*yield*/, (0, upload_1.default)(scanResults, appId, mergeKey, {
+                        return [4 /*yield*/, (0, upload_1.default)(scanResults, appId, appmapDir, mergeKey, { branch: branch, commit: commit, environment: environment }, {
                                 maxRetries: 3,
                             })];
-                    case 5:
+                    case 4:
                         uploadResponse = _d.sent();
                         (0, reportUploadURL_1.default)(uploadResponse.summary.numFindings, uploadResponse.url);
                         return [2 /*return*/];

package/built/cli/upload/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/upload/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wCAAuC;AAGvC,6CAA+C;AAE/C,iEAA2C;AAC3C,iEAA2C;AAC3C,uEAAiD;AAGjD,qDAA+B;AAE/B,kBAAe;IACb,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,sCAAsC;IAChD,OAAO,EAAP,UAAQ,IAAU;QAChB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YACxB,QAAQ,EAAE,2BAA2B;YACrC,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,QAAQ,EAAE,qCAAqC;YAC/C,OAAO,EAAE,uBAAuB;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,QAAQ,EACN,sGAAsG;SACzG,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,QAAQ,EAAE,8EAA8E;SACzF,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IACK,OAAO,EAAb,UAAc,OAAkB;;;;;;wBACxB,KAMF,OAAoC,EAL7B,SAAS,aAAA,EAClB,UAAU,gBAAA,EACV,SAAS,eAAA,EACJ,QAAQ,SAAA,EACb,QAAQ,cAAA,CAC+B;wBAEzC,IAAI,SAAS,EAAE;4BACb,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;yBACf;6BAEG,SAAS,EAAT,wBAAS;wBAAE,qBAAM,IAAA,sBAAY,EAAC,WAAW,EAAE,SAAU,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;;4BAC7C,qBAAM,IAAA,sBAAY,EAAC,QAAQ,EAAE,SAAS,CAAC,EAAA;;wBAA/C,KAAK,GAAG,SAAuC;wBAEjC,KAAA,CAAA,KAAA,IAAI,CAAA,CAAC,KAAK,CAAA;wBAAE,qBAAM,IAAA,mBAAQ,EAAC,UAAU,CAAC,EAAA;;wBAApD,WAAW,GAAG,cAAW,CAAC,SAA0B,CAAC,CAAC,QAAQ,EAAE,EAAgB;wBAC/D,qBAAM,IAAA,gBAAM,EAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE;gCAChE,UAAU,EAAE,CAAC;6BACd,CAAC,EAAA;;wBAFI,cAAc,GAAG,SAErB;wBAEF,IAAA,yBAAe,EAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;;;;KACzE;CACF,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/upload/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wCAAuC;AAGvC,6CAA+C;AAE/C,iEAA2C;AAC3C,iEAA2C;AAC3C,uEAAiD;AAGjD,qDAA+B;AAC/B,uEAAiD;AAEjD,kBAAe;IACb,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,sCAAsC;IAChD,OAAO,EAAP,UAAQ,IAAU;QAChB,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YACxB,QAAQ,EAAE,2BAA2B;YACrC,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,QAAQ,EAAE,qCAAqC;YAC/C,OAAO,EAAE,uBAAuB;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,QAAQ,EACN,sGAAsG;SACzG,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,QAAQ,EAAE,8EAA8E;SACzF,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IACK,OAAO,EAAb,UAAc,OAAkB;;;;;;wBACxB,KASF,OAAoC,EAR7B,SAAS,aAAA,EAClB,UAAU,gBAAA,EACV,SAAS,eAAA,EACJ,QAAQ,SAAA,EACb,QAAQ,cAAA,EACR,MAAM,YAAA,EACN,MAAM,YAAA,EACN,WAAW,iBAAA,CAC4B;wBAEzC,IAAI,SAAS,EAAE;4BACb,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;yBACf;wBAED,qBAAM,IAAA,sBAAY,EAAC,WAAW,EAAE,SAAU,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;wBAC9B,qBAAM,IAAA,sBAAY,EAAC,QAAQ,EAAE,SAAS,CAAC,EAAA;;wBAA/C,KAAK,GAAG,SAAuC;wBAEjC,KAAA,CAAA,KAAA,IAAI,CAAA,CAAC,KAAK,CAAA;wBAAE,qBAAM,IAAA,mBAAQ,EAAC,UAAU,CAAC,EAAA;;wBAApD,WAAW,GAAG,cAAW,CAAC,SAA0B,CAAC,CAAC,QAAQ,EAAE,EAAgB;wBAC/D,qBAAM,IAAA,gBAAM,EACjC,WAAW,EACX,KAAK,EACL,SAAS,EACT,QAAQ,EACR,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,WAAW,aAAA,EAAE,EAC/B;gCACE,UAAU,EAAE,CAAC;6BACd,CACF,EAAA;;wBATK,cAAc,GAAG,SAStB;wBAED,IAAA,yBAAe,EAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;;;;KACzE;CACF,CAAC"}

package/built/cli/upload.js

@@ -78,10 +78,34 @@ var util_1 = require("../rules/lib/util");
 var create_1 = require("../integration/appland/appMap/create");
 var create_2 = require("../integration/appland/mapset/create");
 var create_3 = require("../integration/appland/scannerJob/create");
-function create(scanResults, appId, mergeKey, options) {
-    if (options === void 0) { options = {}; }
+var vars_1 = require("../integration/vars");
+var promises_2 = require("fs/promises");
+var path_1 = require("path");
+function fileExists(file) {
     return __awaiter(this, void 0, void 0, function () {
-        var findings, relevantFilePaths, appMapUUIDByFileName, branchCount, commitCount, createAppMapOptions, q, mostFrequent, branch, commit, mapset;
+        var e_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, (0, promises_2.stat)(file)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/, true];
+                case 2:
+                    e_1 = _a.sent();
+                    return [2 /*return*/, false];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+function create(scanResults, appId, appMapDir, mergeKey, mapsetOptions, retryOptions) {
+    if (mapsetOptions === void 0) { mapsetOptions = {}; }
+    if (retryOptions === void 0) { retryOptions = {}; }
+    return __awaiter(this, void 0, void 0, function () {
+        var findings, relevantFilePaths, appMapUUIDByFileName, branchCount, commitCount, createAppMapOptions, q, mostFrequent, mapset;
+        var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -95,34 +119,48 @@ function create(scanResults, appId, mergeKey, options) {
                     createAppMapOptions = {
                         app: appId,
                     };
-                    q = (0, async_1.queue)(function (filePath, callback) {
-                        if ((0, util_1.verbose)())
-                            console.log("Uploading AppMap " + filePath);
-                        (0, promises_1.readFile)(filePath)
-                            .then(function (buffer) {
-                            var _a, _b;
-                            var appMapStruct = JSON.parse(buffer.toString());
-                            var metadata = appMapStruct.metadata;
-                            var branch = (_a = appMapStruct.metadata.git) === null || _a === void 0 ? void 0 : _a.branch;
-                            var commit = (_b = appMapStruct.metadata.git) === null || _b === void 0 ? void 0 : _b.commit;
-                            if (branch) {
-                                branchCount[branch] || (branchCount[branch] = 1);
-                                branchCount[branch] += 1;
-                            }
-                            if (commit) {
-                                commitCount[commit] || (commitCount[commit] = 1);
-                                commitCount[commit] += 1;
-                            }
-                            return (0, create_1.create)(buffer, Object.assign(options, __assign(__assign({}, createAppMapOptions), { metadata: metadata })));
-                        })
-                            .then(function (appMap) {
-                            if (appMap) {
-                                appMapUUIDByFileName[filePath] = appMap.uuid;
+                    q = (0, async_1.queue)(function (filePath, callback) { return __awaiter(_this, void 0, void 0, function () {
+                        var filePaths, filePathsExist, fullPath;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    if ((0, util_1.verbose)())
+                                        console.log("Uploading AppMap " + filePath);
+                                    filePaths = [filePath, (0, path_1.join)(appMapDir, filePath)];
+                                    return [4 /*yield*/, Promise.all(filePaths.map(fileExists))];
+                                case 1:
+                                    filePathsExist = _a.sent();
+                                    fullPath = filePaths.find(function (_, fileIndex) { return filePathsExist[fileIndex]; });
+                                    if (!fullPath)
+                                        throw new Error("File " + filePath + " not found");
+                                    (0, promises_1.readFile)(fullPath)
+                                        .then(function (buffer) {
+                                        var _a, _b;
+                                        var appMapStruct = JSON.parse(buffer.toString());
+                                        var metadata = appMapStruct.metadata;
+                                        var branch = (_a = appMapStruct.metadata.git) === null || _a === void 0 ? void 0 : _a.branch;
+                                        var commit = (_b = appMapStruct.metadata.git) === null || _b === void 0 ? void 0 : _b.commit;
+                                        if (branch) {
+                                            branchCount[branch] || (branchCount[branch] = 1);
+                                            branchCount[branch] += 1;
+                                        }
+                                        if (commit) {
+                                            commitCount[commit] || (commitCount[commit] = 1);
+                                            commitCount[commit] += 1;
+                                        }
+                                        return (0, create_1.create)(buffer, Object.assign(retryOptions, __assign(__assign({}, createAppMapOptions), { metadata: metadata })));
+                                    })
+                                        .then(function (appMap) {
+                                        if (appMap) {
+                                            appMapUUIDByFileName[filePath] = appMap.uuid;
+                                        }
+                                    })
+                                        .then(function () { return callback(null); })
+                                        .catch(callback);
+                                    return [2 /*return*/];
                             }
-                        })
-                            .then(function () { return callback(); })
-                            .catch(callback);
-                    }, 3);
+                        });
+                    }); }, 3);
                     q.error(function (err, filePath) {
                         console.error("An error occurred uploading " + filePath + ": " + err);
                     });
@@ -138,16 +176,13 @@ function create(scanResults, appId, mergeKey, options) {
                         var maxCount = Object.values(counts).reduce(function (max, count) { return Math.max(max, count); }, 0);
                         return Object.entries(counts).find(function (e) { return e[1] === maxCount; })[0];
                     };
-                    branch = mostFrequent(branchCount);
-                    commit = mostFrequent(commitCount);
-                    return [4 /*yield*/, (0, create_2.create)(appId, Object.values(appMapUUIDByFileName), Object.assign(options, {
-                            branch: branch,
-                            commit: commit,
-                        }))];
+                    mapsetOptions.branch || (mapsetOptions.branch = (0, vars_1.branch)() || mostFrequent(branchCount));
+                    mapsetOptions.commit || (mapsetOptions.commit = (0, vars_1.sha)() || mostFrequent(commitCount));
+                    return [4 /*yield*/, (0, create_2.create)(appId, Object.values(appMapUUIDByFileName), mapsetOptions, retryOptions)];
                 case 2:
                     mapset = _a.sent();
                     console.warn('Uploading findings');
-                    return [2 /*return*/, (0, create_3.create)(scanResults, mapset.id, appMapUUIDByFileName, { mergeKey: mergeKey }, options)];
+                    return [2 /*return*/, (0, create_3.create)(scanResults, mapset.id, appMapUUIDByFileName, { mergeKey: mergeKey }, retryOptions)];
             }
         });
     });

package/built/cli/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/cli/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/cli/upload.ts"],"names":[],"mappings":"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"}

package/built/cli.js

@@ -9,6 +9,9 @@ var command_1 = __importDefault(require("./cli/scan/command"));
 var command_2 = __importDefault(require("./cli/upload/command"));
 var command_3 = __importDefault(require("./cli/ci/command"));
 var command_4 = __importDefault(require("./cli/merge/command"));
+var util_1 = require("./rules/lib/util");
+var errors_1 = require("./errors");
+var exitCode_1 = require("./cli/exitCode");
 (0, yargs_1.default)(process.argv.slice(2))
     .option('verbose', {
     describe: 'Show verbose output',
@@ -20,11 +23,25 @@ var command_4 = __importDefault(require("./cli/merge/command"));
     .command(command_4.default)
     .fail(function (msg, err, yargs) {
     if (msg) {
-        console.log(yargs.help());
-        console.log(msg);
+        console.warn(yargs.help());
+        console.warn(msg);
     }
     else if (err) {
-        console.error(err);
+        if ((0, util_1.verbose)()) {
+            console.error(err);
+        }
+        else {
+            console.error(err.message);
+        }
+        if (err instanceof errors_1.ValidationError) {
+            process.exit(exitCode_1.ExitCode.ValidationError);
+        }
+        if (err instanceof errors_1.AbortError) {
+            process.exit(exitCode_1.ExitCode.AbortError);
+        }
+        if (err instanceof Error) {
+            process.exit(exitCode_1.ExitCode.RuntimeError);
+        }
     }
     process.exit(1);
 })

package/built/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;AAEA,gDAA0B;AAC1B,+DAA6C;AAC7C,iEAAiD;AACjD,6DAAyC;AACzC,gEAA+C;AAE/C,IAAA,eAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,MAAM,CAAC,SAAS,EAAE;IACjB,QAAQ,EAAE,qBAAqB;IAC/B,KAAK,EAAE,GAAG;CACX,CAAC;KACD,OAAO,CAAC,iBAAW,CAAC;KACpB,OAAO,CAAC,iBAAa,CAAC;KACtB,OAAO,CAAC,iBAAS,CAAC;KAClB,OAAO,CAAC,iBAAY,CAAC;KACrB,IAAI,CAAC,UAAC,GAAG,EAAE,GAAG,EAAE,KAAK;IACpB,IAAI,GAAG,EAAE;QACP,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClB;SAAM,IAAI,GAAG,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACpB;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;KACD,MAAM,EAAE;KACR,aAAa,EAAE;KACf,IAAI,EAAE,CAAC,IAAI,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;AAEA,gDAA0B;AAC1B,+DAA6C;AAC7C,iEAAiD;AACjD,6DAAyC;AACzC,gEAA+C;AAC/C,yCAA2C;AAC3C,mCAAuD;AACvD,2CAA0C;AAE1C,IAAA,eAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,MAAM,CAAC,SAAS,EAAE;IACjB,QAAQ,EAAE,qBAAqB;IAC/B,KAAK,EAAE,GAAG;CACX,CAAC;KACD,OAAO,CAAC,iBAAW,CAAC;KACpB,OAAO,CAAC,iBAAa,CAAC;KACtB,OAAO,CAAC,iBAAS,CAAC;KAClB,OAAO,CAAC,iBAAY,CAAC;KACrB,IAAI,CAAC,UAAC,GAAG,EAAE,GAAG,EAAE,KAAK;IACpB,IAAI,GAAG,EAAE;QACP,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACnB;SAAM,IAAI,GAAG,EAAE;QACd,IAAI,IAAA,cAAO,GAAE,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAC5B;QAED,IAAI,GAAG,YAAY,wBAAe,EAAE;YAClC,OAAO,CAAC,IAAI,CAAC,mBAAQ,CAAC,eAAe,CAAC,CAAC;SACxC;QACD,IAAI,GAAG,YAAY,mBAAU,EAAE;YAC7B,OAAO,CAAC,IAAI,CAAC,mBAAQ,CAAC,UAAU,CAAC,CAAC;SACnC;QACD,IAAI,GAAG,YAAY,KAAK,EAAE;YACxB,OAAO,CAAC,IAAI,CAAC,mBAAQ,CAAC,YAAY,CAAC,CAAC;SACrC;KACF;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;KACD,MAAM,EAAE;KACR,aAAa,EAAE;KACf,IAAI,EAAE,CAAC,IAAI,CAAC"}

package/built/integration/appland/app/exists.js

@@ -0,0 +1,98 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exists = void 0;
+var src_1 = require("@appland/client/dist/src");
+var util_1 = require("../../../rules/lib/util");
+var retry_1 = __importDefault(require("../retry"));
+function exists(appId, retryOptions) {
+    if (retryOptions === void 0) { retryOptions = {}; }
+    return __awaiter(this, void 0, void 0, function () {
+        function makeRequest() {
+            return __awaiter(this, void 0, void 0, function () {
+                var requestPath, request;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            requestPath = ['api', appId].join('/');
+                            return [4 /*yield*/, (0, src_1.buildRequest)(requestPath)];
+                        case 1:
+                            request = _a.sent();
+                            return [2 /*return*/, new Promise(function (resolve, reject) {
+                                    var req = request.requestFunction(request.url, {
+                                        method: 'HEAD',
+                                        headers: request.headers,
+                                    }, resolve);
+                                    req.on('error', (0, src_1.retryOnError)(retrier, resolve, reject));
+                                    req.end();
+                                }).then((0, src_1.retryOn503)(retrier))];
+                    }
+                });
+            });
+        }
+        var commandDescription, retrier;
+        var _this = this;
+        return __generator(this, function (_a) {
+            commandDescription = "Checking if app " + appId + " exists";
+            if ((0, util_1.verbose)())
+                console.log(commandDescription);
+            retrier = (0, retry_1.default)(commandDescription, retryOptions, makeRequest);
+            return [2 /*return*/, makeRequest().then(function (response) { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        if ((0, util_1.verbose)())
+                            console.log(commandDescription + ": statusCode=" + response.statusCode);
+                        if (!response.statusCode) {
+                            throw new Error('No status code was provided by the server');
+                        }
+                        if (response.statusCode === 404) {
+                            return [2 /*return*/, false];
+                        }
+                        else if (response.statusCode < 300) {
+                            return [2 /*return*/, true];
+                        }
+                        throw new Error("Unexpected status code: " + response.statusCode);
+                    });
+                }); })];
+        });
+    });
+}
+exports.exists = exists;
+//# sourceMappingURL=exists.js.map

package/built/integration/appland/app/exists.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exists.js","sourceRoot":"","sources":["../../../../src/integration/appland/app/exists.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,gDAAkF;AAClF,gDAAkD;AAElD,mDAA6B;AAE7B,SAAsB,MAAM,CAAC,KAAa,EAAE,YAA+B;IAA/B,6BAAA,EAAA,iBAA+B;;QAMzE,SAAe,WAAW;;;;;;4BAClB,WAAW,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BAC7B,qBAAM,IAAA,kBAAY,EAAC,WAAW,CAAC,EAAA;;4BAAzC,OAAO,GAAG,SAA+B;4BAC/C,sBAAO,IAAI,OAAO,CAAkB,UAAC,OAAO,EAAE,MAAM;oCAClD,IAAM,GAAG,GAAG,OAAO,CAAC,eAAe,CACjC,OAAO,CAAC,GAAG,EACX;wCACE,MAAM,EAAE,MAAM;wCACd,OAAO,EAAE,OAAO,CAAC,OAAO;qCACzB,EACD,OAAO,CACR,CAAC;oCACF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,IAAA,kBAAY,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;oCACxD,GAAG,CAAC,GAAG,EAAE,CAAC;gCACZ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAA,gBAAU,EAAC,OAAO,CAAC,CAAC,EAAC;;;;SAC9B;;;;YApBK,kBAAkB,GAAG,qBAAmB,KAAK,YAAS,CAAC;YAC7D,IAAI,IAAA,cAAO,GAAE;gBAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAEzC,OAAO,GAAG,IAAA,eAAK,EAAC,kBAAkB,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;YAmBrE,sBAAO,WAAW,EAAE,CAAC,IAAI,CAAC,UAAO,QAAyB;;wBACxD,IAAI,IAAA,cAAO,GAAE;4BAAE,OAAO,CAAC,GAAG,CAAI,kBAAkB,qBAAgB,QAAQ,CAAC,UAAY,CAAC,CAAC;wBAEvF,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;4BACxB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;yBAC9D;wBACD,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;4BAC/B,sBAAO,KAAK,EAAC;yBACd;6BAAM,IAAI,QAAQ,CAAC,UAAW,GAAG,GAAG,EAAE;4BACrC,sBAAO,IAAI,EAAC;yBACb;wBACD,MAAM,IAAI,KAAK,CAAC,6BAA2B,QAAQ,CAAC,UAAY,CAAC,CAAC;;qBACnE,CAAC,EAAC;;;CACJ;AApCD,wBAoCC"}

package/built/integration/vars.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validatePullRequestNumber = exports.validateSha = exports.validateRepo = exports.validateOwner = exports.validateToken = exports.pullRequestNumber = exports.repo = exports.sha = exports.owner = exports.token = void 0;
+exports.validatePullRequestNumber = exports.validateSha = exports.validateRepo = exports.validateOwner = exports.validateToken = exports.pullRequestNumber = exports.repo = exports.sha = exports.owner = exports.token = exports.branch = void 0;
 var errors_1 = require("../errors");
 function token() {
     return process.env.GH_STATUS_TOKEN || process.env.GH_TOKEN;
@@ -10,7 +10,8 @@ function sha() {
     return (process.env.CIRCLE_SHA1 ||
         process.env.TRAVIS_PULL_REQUEST_SHA ||
         process.env.TRAVIS_COMMIT ||
-        process.env.CI_COMMIT_ID);
+        process.env.CI_COMMIT_ID ||
+        process.env.GITHUB_SHA);
 }
 exports.sha = sha;
 function pullRequestNumber() {
@@ -29,6 +30,14 @@ function repo() {
         extractSlug(process.env.CI_REPO_NAME, 1));
 }
 exports.repo = repo;
+function branch() {
+    return (process.env.CIRCLE_BRANCH ||
+        process.env.TRAVIS_BRANCH ||
+        process.env.CI_COMMIT_REF_NAME ||
+        process.env.CI_BRANCH ||
+        process.env.GITHUB_REF_NAME);
+}
+exports.branch = branch;
 function extractSlug(path, index) {
     if (!path) {
         return undefined;

package/built/integration/vars.js.map

@@ -1 +1 @@
-{"version":3,"file":"vars.js","sourceRoot":"","sources":["../../src/integration/vars.ts"],"names":[],"mappings":";;;AAAA,oCAA4C;AAE5C,SAAS,KAAK;IACZ,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAC7D,CAAC;AA0EC,sBAAK;AAxEP,SAAS,GAAG;IACV,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,uBAAuB;QACnC,OAAO,CAAC,GAAG,CAAC,aAAa;QACzB,OAAO,CAAC,GAAG,CAAC,YAAY,CACzB,CAAC;AACJ,CAAC;AAmEC,kBAAG;AAjEL,SAAS,iBAAiB;IACxB,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAC5F,CAAC;AACJ,CAAC;AA+DC,8CAAiB;AA7DnB,SAAS,KAAK;IACZ,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,uBAAuB;QACnC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC5C,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAC1C,CAAC;AACJ,CAAC;AAoDC,sBAAK;AAlDP,SAAS,IAAI;IACX,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,uBAAuB;QACnC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC5C,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CACzC,CAAC;AACJ,CAAC;AA8CC,oBAAI;AA5CN,SAAS,WAAW,CAAC,IAAwB,EAAE,KAAa;IAC1D,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,aAAa;IACpB,IAAI,CAAC,KAAK,EAAE,EAAE;QACZ,MAAM,IAAI,wBAAe,CACvB,uEAAuE,CACxE,CAAC;KACH;AACH,CAAC;AAgCC,sCAAa;AA9Bf,SAAS,WAAW;IAClB,IAAI,CAAC,GAAG,EAAE,EAAE;QACV,MAAM,IAAI,wBAAe,CAAC,sCAAsC,CAAC,CAAC;KACnE;AACH,CAAC;AA6BC,kCAAW;AA3Bb,SAAS,yBAAyB;IAChC,IAAI,CAAC,iBAAiB,EAAE,EAAE;QACxB,MAAM,IAAI,wBAAe,CAAC,8CAA8C,CAAC,CAAC;KAC3E;AACH,CAAC;AAwBC,8DAAyB;AAtB3B,SAAS,aAAa;IACpB,IAAI,CAAC,KAAK,EAAE,EAAE;QACZ,MAAM,IAAI,wBAAe,CAAC,mCAAmC,CAAC,CAAC;KAChE;AACH,CAAC;AAeC,sCAAa;AAbf,SAAS,YAAY;IACnB,IAAI,CAAC,IAAI,EAAE,EAAE;QACX,MAAM,IAAI,wBAAe,CAAC,kCAAkC,CAAC,CAAC;KAC/D;AACH,CAAC;AAUC,oCAAY"}
+{"version":3,"file":"vars.js","sourceRoot":"","sources":["../../src/integration/vars.ts"],"names":[],"mappings":";;;AAAA,oCAA4C;AAE5C,SAAS,KAAK;IACZ,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAC7D,CAAC;AAsFC,sBAAK;AApFP,SAAS,GAAG;IACV,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,uBAAuB;QACnC,OAAO,CAAC,GAAG,CAAC,aAAa;QACzB,OAAO,CAAC,GAAG,CAAC,YAAY;QACxB,OAAO,CAAC,GAAG,CAAC,UAAU,CACvB,CAAC;AACJ,CAAC;AA8EC,kBAAG;AA5EL,SAAS,iBAAiB;IACxB,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAC5F,CAAC;AACJ,CAAC;AA0EC,8CAAiB;AAxEnB,SAAS,KAAK;IACZ,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,uBAAuB;QACnC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC5C,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAC1C,CAAC;AACJ,CAAC;AA+DC,sBAAK;AA7DP,SAAS,IAAI;IACX,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,uBAAuB;QACnC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC5C,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CACzC,CAAC;AACJ,CAAC;AAyDC,oBAAI;AAvDN,SAAS,MAAM;IACb,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,aAAa;QACzB,OAAO,CAAC,GAAG,CAAC,aAAa;QACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAC9B,OAAO,CAAC,GAAG,CAAC,SAAS;QACrB,OAAO,CAAC,GAAG,CAAC,eAAe,CAC5B,CAAC;AACJ,CAAC;AA2CC,wBAAM;AAzCR,SAAS,WAAW,CAAC,IAAwB,EAAE,KAAa;IAC1D,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,aAAa;IACpB,IAAI,CAAC,KAAK,EAAE,EAAE;QACZ,MAAM,IAAI,wBAAe,CACvB,uEAAuE,CACxE,CAAC;KACH;AACH,CAAC;AAiCC,sCAAa;AA/Bf,SAAS,WAAW;IAClB,IAAI,CAAC,GAAG,EAAE,EAAE;QACV,MAAM,IAAI,wBAAe,CAAC,sCAAsC,CAAC,CAAC;KACnE;AACH,CAAC;AA8BC,kCAAW;AA5Bb,SAAS,yBAAyB;IAChC,IAAI,CAAC,iBAAiB,EAAE,EAAE;QACxB,MAAM,IAAI,wBAAe,CAAC,8CAA8C,CAAC,CAAC;KAC3E;AACH,CAAC;AAyBC,8DAAyB;AAvB3B,SAAS,aAAa;IACpB,IAAI,CAAC,KAAK,EAAE,EAAE;QACZ,MAAM,IAAI,wBAAe,CAAC,mCAAmC,CAAC,CAAC;KAChE;AACH,CAAC;AAgBC,sCAAa;AAdf,SAAS,YAAY;IACnB,IAAI,CAAC,IAAI,EAAE,EAAE;QACX,MAAM,IAAI,wBAAe,CAAC,kCAAkC,CAAC,CAAC;KAC/D;AACH,CAAC;AAWC,oCAAY"}

package/built/report/summaryReport.js

@@ -1,66 +1,46 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var chalk_1 = __importDefault(require("chalk"));
+var util_1 = require("../rules/lib/util");
 function summarizeFindings(findings) {
     var result = findings.reduce(function (memo, finding) {
         var findingSummary = memo[finding.ruleId];
         if (findingSummary) {
             findingSummary.findingTotal += 1;
-            findingSummary.messages.add(finding.message);
+            if (!findingSummary.findingHashes.has(finding.hash)) {
+                findingSummary.findingHashes.add(finding.hash);
+                findingSummary.messages.push(finding.message);
+            }
         }
         else {
             findingSummary = {
                 ruleId: finding.ruleId,
                 ruleTitle: finding.ruleTitle,
                 findingTotal: 1,
-                messages: new Set([finding.message]),
+                findingHashes: new Set([finding.hash]),
+                messages: [finding.message],
             };
             memo[finding.ruleId] = findingSummary;
         }
         return memo;
     }, {});
+    Object.values(result).forEach(function (findingSummary) { return (findingSummary.messages = findingSummary.messages.sort()); });
     return Object.values(result);
 }
 function default_1(summary, colorize) {
-    var matchedStr = summary.summary.numFindings + " finding" + (summary.summary.numFindings === 1 ? '' : 's');
+    var matchedStr = summary.summary.numFindings + " " + (0, util_1.pluralize)('finding', summary.summary.numFindings) + " (" + new Set(summary.findings.map(function (finding) { return finding.hash; })).size + " unique)";
     var colouredMatchedStr = colorize ? chalk_1.default.stderr.magenta(matchedStr) : matchedStr;
     console.log();
     console.log(colouredMatchedStr);
     summarizeFindings(summary.findings)
         .sort(function (a, b) { return a.ruleTitle.localeCompare(b.ruleTitle); })
         .forEach(function (finding) {
-        var casesStr = "\t- " + finding.ruleTitle + " (" + finding.ruleId + ") : " + finding.findingTotal + " case(s)";
+        var casesStr = "\t- " + finding.ruleTitle + " (" + finding.ruleId + ") : " + finding.findingTotal + " " + (0, util_1.pluralize)('case', finding.findingTotal) + " (" + finding.findingHashes.size + " unique)";
         console.log(colorize ? chalk_1.default.stderr.magenta(casesStr) : casesStr);
-        var uniqueMessages = __spreadArray([], __read(new Set(finding.messages)), false).sort();
-        uniqueMessages.forEach(function (message) {
+        finding.messages.forEach(function (message) {
             var messageStr = "\t\t" + message;
             console.log(colorize ? chalk_1.default.stderr.magenta(messageStr) : messageStr);
         });

package/built/report/summaryReport.js.map

@@ -1 +1 @@
-{"version":3,"file":"summaryReport.js","sourceRoot":"","sources":["../../src/report/summaryReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAK1B,SAAS,iBAAiB,CAAC,QAAmB;IAC5C,IAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,IAAI,EAAE,OAAO;QAC3C,IAAI,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,cAAc,EAAE;YAClB,cAAc,CAAC,YAAY,IAAI,CAAC,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC9C;aAAM;YACL,cAAc,GAAG;gBACf,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,YAAY,EAAE,CAAC;gBACf,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACnB,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;SACvC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAoC,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,mBAAyB,OAAoB,EAAE,QAAiB;IAC9D,IAAM,UAAU,GAAM,OAAO,CAAC,OAAO,CAAC,WAAW,iBAC/C,OAAO,CAAC,OAAO,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAC5C,CAAC;IACH,IAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAEpF,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEhC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC;SAChC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,EAAtC,CAAsC,CAAC;SACtD,OAAO,CAAC,UAAC,OAAO;QACf,IAAM,QAAQ,GAAG,SAAO,OAAO,CAAC,SAAS,UAAK,OAAO,CAAC,MAAM,YAAO,OAAO,CAAC,YAAY,aAAU,CAAC;QAClG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAM,cAAc,GAAG,yBAAI,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAE,IAAI,EAAE,CAAC;QAC7D,cAAc,CAAC,OAAO,CAAC,UAAC,OAAO;YAC7B,IAAM,UAAU,GAAG,SAAO,OAAS,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AApBD,4BAoBC"}
+{"version":3,"file":"summaryReport.js","sourceRoot":"","sources":["../../src/report/summaryReport.ts"],"names":[],"mappings":"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"}

package/built/rules/lib/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verbose = exports.toRegExpArray = exports.responseContentType = exports.toRegExp = exports.providesAuthentication = exports.parseValue = exports.isRoot = exports.ideLink = exports.isTruthy = exports.isFalsey = exports.emptyValue = exports.capitalize = exports.appMapDir = void 0;
+exports.verbose = exports.toRegExpArray = exports.responseContentType = exports.toRegExp = exports.providesAuthentication = exports.pluralize = exports.parseValue = exports.isRoot = exports.ideLink = exports.isTruthy = exports.isFalsey = exports.emptyValue = exports.capitalize = exports.appMapDir = void 0;
 var path_1 = require("path");
 var isVerbose = false;
 function verbose(v) {
@@ -115,4 +115,8 @@ var isRoot = function (event) {
     return (!!event.httpServerRequest || RootLabels.some(function (label) { return event.codeObject.labels.has(label); }));
 };
 exports.isRoot = isRoot;
+function pluralize(word, count) {
+    return count === 1 ? word : [word, 's'].join('');
+}
+exports.pluralize = pluralize;
 //# sourceMappingURL=util.js.map

package/built/rules/lib/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/rules/lib/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/rules/lib/util.ts"],"names":[],"mappings":"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"}

package/built/rules/missingAuthentication.js

@@ -41,7 +41,14 @@ function build(options) {
             !excludeContentTypes.some(test));
     }
     function matcher(event) {
-        return !authenticatedBy(new models_1.EventNavigator(event).descendants());
+        if (!authenticatedBy(new models_1.EventNavigator(event).descendants())) {
+            return [
+                {
+                    event: event,
+                    message: "Unauthenticated HTTP server request: " + event.route,
+                },
+            ];
+        }
     }
     function where(e) {
         return (e.route !== undefined &&

package/built/rules/missingAuthentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"missingAuthentication.js","sourceRoot":"","sources":["../../src/rules/missingAuthentication.ts"],"names":[],"mappings":";;;;;AAAA,0CAAwD;AACxD,oDAA2D;AAG3D,mCAAoD;AAEpD,mDAAkD;AAClD,2BAA0B;AAC1B,oFAA8D;AAE9D,SAAS,QAAQ,CAAC,KAAY;IAC5B,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AACxC,CAAC;AAED,IAAM,eAAe,GAAG,UAAC,QAAkC;IACzD,IAAI,CAAC,GAAmC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACxD,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;QACd,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAA,6BAAsB,EAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,sBAAsB,CAAC,EAAE;YAC5F,OAAO,IAAI,CAAC;SACb;QACD,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;KACrB;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;IAAA;QACS,wBAAmB,GAAyB,EAAE,CAAC;QAC/C,wBAAmB,GAAyB,EAAE,CAAC;IACxD,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,IAGC;AAED,SAAS,KAAK,CAAC,OAAgC;IAAhC,wBAAA,EAAA,cAAuB,OAAO,EAAE;IAC7C,IAAM,mBAAmB,GAAG,IAAA,2BAAY,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACtE,IAAM,mBAAmB,GAAG,IAAA,2BAAY,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEtE,SAAS,eAAe,CAAC,WAAmB;QAC1C,SAAS,IAAI,CAAC,MAAoB;YAChC,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC;QAC7B,CAAC;QAED,OAAO,CACL,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpE,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAChC,CAAC;IACJ,CAAC;IAED,SAAS,OAAO,CAAC,KAAY;QAC3B,OAAO,CAAC,eAAe,CAAC,IAAI,uBAAc,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,SAAS,KAAK,CAAC,CAAQ;QACrB,OAAO,CACL,CAAC,CAAC,KAAK,KAAK,SAAS;YACrB,CAAC,CAAC,kBAAkB,KAAK,SAAS;YAClC,CAAC,CAAC,kBAAkB,CAAC,MAAM,GAAG,GAAG;YACjC,CAAC,CAAC,IAAA,+BAAkB,EAAC,CAAC,CAAC;YACvB,CAAC,CAAC,IAAA,+BAAkB,EAAC,CAAC,CAAE,CAAC,WAAW;YACpC,eAAe,CAAC,IAAA,+BAAkB,EAAC,CAAC,CAAE,CAAC,WAAW,CAAC,CACpD,CAAC;IACJ,CAAC;IACD,OAAO;QACL,KAAK,OAAA;QACL,OAAO,SAAA;KACR,CAAC;AACJ,CAAC;AACD,IAAM,YAAY,GAAG,eAAe,CAAC;AACrC,IAAM,sBAAsB,GAAG,yBAAyB,CAAC;AAEzD,kBAAe;IACb,EAAE,EAAE,wBAAwB;IAC5B,KAAK,EAAE,qCAAqC;IAC5C,KAAK,EAAE,qBAAqB;IAC5B,MAAM,EAAE,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAC9C,YAAY,EAAE,UAAU;IACxB,cAAc,EAAE,KAAK;IACrB,UAAU,EAAE;QACV,SAAS,EAAE,IAAI,SAAG,CAAC,iDAAiD,CAAC;KACtE;IACD,WAAW,EAAE,IAAA,8BAAoB,EAAC,uBAAuB,CAAC;IAC1D,GAAG,EAAE,+EAA+E;IACpF,OAAO,SAAA;IACP,KAAK,OAAA;CACE,CAAC"}
+{"version":3,"file":"missingAuthentication.js","sourceRoot":"","sources":["../../src/rules/missingAuthentication.ts"],"names":[],"mappings":"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"}

package/built/rules/unbatchedMaterializedQuery.js

@@ -50,9 +50,19 @@ function isApplicable(e, appMapIndex) {
         return false;
     }
 }
+function matcher(event, appMapIndex) {
+    if (isApplicable(event, appMapIndex)) {
+        return [
+            {
+                event: event,
+                message: "Unbatched materialized SQL query: " + event.sqlQuery,
+            },
+        ];
+    }
+}
 function build() {
     return {
-        matcher: function (e, appMapIndex) { return isApplicable(e, appMapIndex); },
+        matcher: matcher,
         where: function (e) { return !!e.sqlQuery; },
     };
 }

package/built/rules/unbatchedMaterializedQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"unbatchedMaterializedQuery.js","sourceRoot":"","sources":["../../src/rules/unbatchedMaterializedQuery.ts"],"names":[],"mappings":";;;;;AAEA,2CAA0C;AAC1C,2BAA0B;AAC1B,oFAA8D;AAE9D,SAAS,cAAc,CAAC,CAAQ;IAC9B,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,UAAC,EAAU;YAAR,MAAM,YAAA;QAAO,OAAA,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;IAA1B,CAA0B,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,YAAY,CAAC,CAAQ,EAAE,WAAwB;IACtD,IAAI;QACF,IAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,UAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,SAAO,GAAG,KAAK,CAAC;QACpB,IAAI,gBAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,iBAAe,GAAG,KAAK,CAAC;QAE5B,IAAI,GAAG,EAAE;YACP,IAAM,oBAAkB,GAAG,CAAC,eAAe,CAAC,CAAC;YAE7C,IAAA,aAAK,EAAC,GAAG,EAAE;gBACT,kBAAkB,EAAE,UAAC,SAAc;oBACjC,UAAQ,GAAG,IAAI,CAAC;oBAEhB,IACE,SAAS,CAAC,MAAM;wBAChB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;wBAC/B,SAAS,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;wBAC7B,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU;wBACvC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EACzC;wBACA,SAAO,GAAG,IAAI,CAAC;qBAChB;gBACH,CAAC;gBACD,kBAAkB,EAAE;oBAClB,gBAAc,GAAG,IAAI,CAAC;gBACxB,CAAC;gBACD,kBAAkB,EAAE,UAAC,UAAe;oBAClC,IAAI,oBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;wBAChD,iBAAe,GAAG,IAAI,CAAC;qBACxB;gBACH,CAAC;aACF,CAAC,CAAC;SACJ;QAED,IAAM,SAAS,GAAG,gBAAc,IAAI,SAAO,IAAI,iBAAe,CAAC;QAE/D,OAAO,UAAQ,IAAI,CAAC,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;KACpD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,+BAA4B,CAAC,CAAC,QAAS,OAAG,CAAC,CAAC;QACzD,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,KAAK;IACZ,OAAO;QACL,OAAO,EAAE,UAAC,CAAC,EAAE,WAAwB,IAAK,OAAA,YAAY,CAAC,CAAC,EAAE,WAAW,CAAC,EAA5B,CAA4B;QACtE,KAAK,EAAE,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAZ,CAAY;KAC3B,CAAC;AACJ,CAAC;AAED,0CAA0C;AAC1C,IAAM,cAAc,GAAG,iBAAiB,CAAC;AAEzC,kBAAe;IACb,EAAE,EAAE,8BAA8B;IAClC,KAAK,EAAE,kCAAkC;IACzC,MAAM,EAAE,CAAC,cAAc,CAAC;IACxB,cAAc,EAAE,IAAI;IACpB,YAAY,EAAE,aAAa;IAC3B,UAAU,EAAE;QACV,UAAU,EAAE,IAAI,SAAG,CAAC,kDAAkD,CAAC;KACxE;IACD,WAAW,EAAE,IAAA,8BAAoB,EAAC,4BAA4B,CAAC;IAC/D,GAAG,EAAE,qFAAqF;IAC1F,KAAK,OAAA;CACE,CAAC"}
+{"version":3,"file":"unbatchedMaterializedQuery.js","sourceRoot":"","sources":["../../src/rules/unbatchedMaterializedQuery.ts"],"names":[],"mappings":";;;;;AAEA,2CAA0C;AAC1C,2BAA0B;AAC1B,oFAA8D;AAE9D,SAAS,cAAc,CAAC,CAAQ;IAC9B,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,UAAC,EAAU;YAAR,MAAM,YAAA;QAAO,OAAA,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;IAA1B,CAA0B,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,YAAY,CAAC,CAAQ,EAAE,WAAwB;IACtD,IAAI;QACF,IAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,UAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,SAAO,GAAG,KAAK,CAAC;QACpB,IAAI,gBAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,iBAAe,GAAG,KAAK,CAAC;QAE5B,IAAI,GAAG,EAAE;YACP,IAAM,oBAAkB,GAAG,CAAC,eAAe,CAAC,CAAC;YAE7C,IAAA,aAAK,EAAC,GAAG,EAAE;gBACT,kBAAkB,EAAE,UAAC,SAAc;oBACjC,UAAQ,GAAG,IAAI,CAAC;oBAEhB,IACE,SAAS,CAAC,MAAM;wBAChB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;wBAC/B,SAAS,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;wBAC7B,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU;wBACvC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EACzC;wBACA,SAAO,GAAG,IAAI,CAAC;qBAChB;gBACH,CAAC;gBACD,kBAAkB,EAAE;oBAClB,gBAAc,GAAG,IAAI,CAAC;gBACxB,CAAC;gBACD,kBAAkB,EAAE,UAAC,UAAe;oBAClC,IAAI,oBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;wBAChD,iBAAe,GAAG,IAAI,CAAC;qBACxB;gBACH,CAAC;aACF,CAAC,CAAC;SACJ;QAED,IAAM,SAAS,GAAG,gBAAc,IAAI,SAAO,IAAI,iBAAe,CAAC;QAE/D,OAAO,UAAQ,IAAI,CAAC,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;KACpD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,+BAA4B,CAAC,CAAC,QAAS,OAAG,CAAC,CAAC;QACzD,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,OAAO,CAAC,KAAY,EAAE,WAAwB;IACrD,IAAI,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE;QACpC,OAAO;YACL;gBACE,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,uCAAqC,KAAK,CAAC,QAAU;aAC/D;SACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,KAAK;IACZ,OAAO;QACL,OAAO,SAAA;QACP,KAAK,EAAE,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAZ,CAAY;KAC3B,CAAC;AACJ,CAAC;AAED,0CAA0C;AAC1C,IAAM,cAAc,GAAG,iBAAiB,CAAC;AAEzC,kBAAe;IACb,EAAE,EAAE,8BAA8B;IAClC,KAAK,EAAE,kCAAkC;IACzC,MAAM,EAAE,CAAC,cAAc,CAAC;IACxB,cAAc,EAAE,IAAI;IACpB,YAAY,EAAE,aAAa;IAC3B,UAAU,EAAE;QACV,UAAU,EAAE,IAAI,SAAG,CAAC,kDAAkD,CAAC;KACxE;IACD,WAAW,EAAE,IAAA,8BAAoB,EAAC,4BAA4B,CAAC;IAC/D,GAAG,EAAE,qFAAqF;IAC1F,KAAK,OAAA;CACE,CAAC"}

package/built/scope/commandScope.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandScope.js","sourceRoot":"","sources":["../../src/scope/commandScope.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAwD;AAGxD,kEAA4C;AAE5C;IAIE,mBAAY,KAAY;QACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEA,0BAAM,GAAP;;;;;wBACE,qBAAM,IAAI,CAAC,KAAK,EAAA;;oBAAhB,SAAgB,CAAC;;;;oBAEG,KAAA,SAAA,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAA;;;;oBAAvC,KAAK;oBACd,qBAAM,KAAK,CAAC,KAAK,EAAA;;oBAAjB,SAAiB,CAAC;;;;;;;;;;;;;;;;;;;KAErB;IACH,gBAAC;AAAD,CAAC,AAhBD,IAgBC;AAED,IAAM,OAAO,GAAG,iBAAiB,CAAC;AAClC,IAAM,GAAG,GAAG,aAAa,CAAC;AAE1B;IAA0C,gCAAa;IAAvD;;IAeA,CAAC;IAdE,6BAAM,GAAP,UAAQ,MAA+B;;;;;;;oBACjB,WAAA,SAAA,MAAM,CAAA;;;;oBAAf,KAAK;yBAEZ,CAAA,KAAK,CAAC,MAAM,EAAE;wBACd,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;4BACnC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;4BAChC,KAAK,CAAC,iBAAiB,CAAC,CAAA,EAH1B,wBAG0B;oBAE1B,qBAAM,IAAI,SAAS,CAAC,KAAK,CAAC,EAAA;;oBAA1B,SAA0B,CAAC;oBAE3B,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;;;;;;;;;;;;;;;;;;;KAG9C;IACH,mBAAC;AAAD,CAAC,AAfD,CAA0C,uBAAa,GAetD"}
+{"version":3,"file":"commandScope.js","sourceRoot":"","sources":["../../src/scope/commandScope.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAwD;AAExD,kEAA4C;AAE5C;IAIE,mBAAY,KAAY;QACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEA,0BAAM,GAAP;;;;;wBACE,qBAAM,IAAI,CAAC,KAAK,EAAA;;oBAAhB,SAAgB,CAAC;;;;oBAEG,KAAA,SAAA,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAA;;;;oBAAvC,KAAK;oBACd,qBAAM,KAAK,CAAC,KAAK,EAAA;;oBAAjB,SAAiB,CAAC;;;;;;;;;;;;;;;;;;;KAErB;IACH,gBAAC;AAAD,CAAC,AAhBD,IAgBC;AAED,IAAM,OAAO,GAAG,iBAAiB,CAAC;AAClC,IAAM,GAAG,GAAG,aAAa,CAAC;AAE1B;IAA0C,gCAAa;IAAvD;;IAeA,CAAC;IAdE,6BAAM,GAAP,UAAQ,MAA+B;;;;;;;oBACjB,WAAA,SAAA,MAAM,CAAA;;;;oBAAf,KAAK;yBAEZ,CAAA,KAAK,CAAC,MAAM,EAAE;wBACd,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;4BACnC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;4BAChC,KAAK,CAAC,iBAAiB,CAAC,CAAA,EAH1B,wBAG0B;oBAE1B,qBAAM,IAAI,SAAS,CAAC,KAAK,CAAC,EAAA;;oBAA1B,SAA0B,CAAC;oBAE3B,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;;;;;;;;;;;;;;;;;;;KAG9C;IACH,mBAAC;AAAD,CAAC,AAfD,CAA0C,uBAAa,GAetD"}

package/doc/rules/deserializationOfUntrustedData.md

@@ -21,7 +21,7 @@ Finds all events labeled `deserialize.unsafe`, that are not a descendant of an e
 `deserialize.safe`. For each of these events, all event parameters are checked.
 
 Each parameter whose type is `string` or `object` is verified to ensure that it's trusted. For data
-to be trusted, it must be the return value of a function labeled `sanitize`.
+to be trusted, it must be the return value of a function labeled `deserialize.sanitize`.
 
 ### Notes
 
@@ -31,8 +31,8 @@ that executes code shortly after deserialization.
 ### Resolution
 
 If you can guarantee that you are using unsafe deserialization in a safe way, but it's not possible
-to obtain the raw data from a function labeled `sanitize`, you can wrap the deserialization in a
-function labeled `deserialize.safe`.
+to obtain the raw data from a function labeled `deserialize.sanitize`, you can wrap the
+deserialization in a function labeled `deserialize.safe`.
 
 If you need to deserialize untrusted data, JSON is often a good choice as it is only capable of
 returning ‘primitive’ types such as strings, arrays, hashes, numbers and nil. If you need to

package/doc/rules/execOfUntrustedCommand.md

@@ -14,3 +14,26 @@ labels:
 Find occurrances of system command execution in which the command string is not guaranteed to be
 safe.
 
+### Rule logic
+
+Find all events labeled `system.exec` that are not a descendant of an event labeled
+`system.exec.safe`. For each of these events, all event parameters are checked.
+
+Each parameter whose type is `string` or `object` is verified to ensure that it's trusted. For data
+to be trusted, it must be the return value of a function labeled `system.exec.sanitize`.
+
+### Resolution
+
+If you can guarantee that you are using system command execution in a safe way, but it's not
+possible to obtain the raw data from a function labeled `system.exec.sanitize`, you can wrap the
+system command in a function labeled `system.exec.safe`.
+
+### Options
+
+None
+
+### Examples
+
+```yaml
+- rule: execOfUntrustedCommand
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.49.0",
+  "version": "1.51.0",
   "description": "",
   "bin": "built/cli.js",
   "files": [
@@ -31,7 +31,7 @@
     "@types/js-yaml": "^4.0.3",
     "@types/lru-cache": "^5.1.1",
     "@types/node": "^16.7.10",
-    "@types/sinon": "^10.0.2",
+    "@types/sinon": "^10.0.11",
     "@types/tar-stream": "^2.2.2",
     "@types/yargs": "^17.0.2",
     "@typescript-eslint/eslint-plugin": "^4.30.0",
@@ -46,7 +46,7 @@
     "pkg": "^5.5.2",
     "prettier": "^2.3.2",
     "semantic-release": "^19.0.2",
-    "sinon": "^11.1.2",
+    "sinon": "^13.0.1",
     "ts-jest": "^27.1.3",
     "ts-json-schema-generator": "^0.97.0",
     "ts-node": "^10.2.1",