@appland/scanner 1.54.1 → 1.55.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/built/cli/ci/command.js +33 -24
- package/built/cli/ci/command.js.map +1 -1
- package/built/cli/scan/command.js +31 -21
- package/built/cli/scan/command.js.map +1 -1
- package/built/cli/scanArgs.js +2 -3
- package/built/cli/scanArgs.js.map +1 -1
- package/built/cli/upload/command.js +1 -1
- package/built/cli/upload/command.js.map +1 -1
- package/built/configuration/configurationProvider.js +8 -2
- package/built/configuration/configurationProvider.js.map +1 -1
- package/built/rules/lib/util.js +64 -1
- package/built/rules/lib/util.js.map +1 -1
- package/package.json +1 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
# [@appland/scanner-v1.55.0](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.54.1...@appland/scanner-v1.55.0) (2022-05-10)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Change default file names ([e173fbb](https://github.com/applandinc/appmap-js/commit/e173fbbe464c8076133f91e04ecdb531dd80c13f))
|
|
7
|
+
* Read appmap_dir from appmap.yml ([b0b6b0d](https://github.com/applandinc/appmap-js/commit/b0b6b0db45eec8c0b8fa96d0f3005677a43f813b))
|
|
8
|
+
* Support repeated appmap-file option ([62edf68](https://github.com/applandinc/appmap-js/commit/62edf68a00d2e169cfbfed5e63246b5fbec947d7))
|
|
9
|
+
|
|
1
10
|
# [@appland/scanner-v1.54.1](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.54.0...@appland/scanner-v1.54.1) (2022-05-03)
|
|
2
11
|
|
|
3
12
|
|
package/built/cli/ci/command.js
CHANGED
|
@@ -102,48 +102,57 @@ exports.default = {
|
|
|
102
102
|
},
|
|
103
103
|
handler: function (options) {
|
|
104
104
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
|
-
var
|
|
105
|
+
var appmapDir, _a, config, isVerbose, failOption, appIdArg, reportFile, doUpload, updateCommitStatusOption, mergeKey, commit, branch, environment, appId, glob, files, configData, scanner, _b, rawScanResults, findingStatuses, scanResults, uploadResponse, err_1;
|
|
106
106
|
return __generator(this, function (_c) {
|
|
107
107
|
switch (_c.label) {
|
|
108
108
|
case 0:
|
|
109
|
-
|
|
109
|
+
appmapDir = options.appmapDir;
|
|
110
|
+
_a = options, 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;
|
|
110
111
|
if (isVerbose) {
|
|
111
112
|
(0, util_2.verbose)(true);
|
|
112
113
|
}
|
|
113
114
|
_c.label = 1;
|
|
114
115
|
case 1:
|
|
115
|
-
_c.trys.push([1,
|
|
116
|
-
if (
|
|
117
|
-
|
|
118
|
-
}
|
|
119
|
-
return [4 /*yield*/, (0, validateFile_1.default)('directory', appmapDir)];
|
|
116
|
+
_c.trys.push([1, 17, , 18]);
|
|
117
|
+
if (!!appmapDir) return [3 /*break*/, 3];
|
|
118
|
+
return [4 /*yield*/, (0, util_2.appmapDirFromConfig)()];
|
|
120
119
|
case 2:
|
|
120
|
+
appmapDir = _c.sent();
|
|
121
|
+
_c.label = 3;
|
|
122
|
+
case 3:
|
|
123
|
+
if (!!appmapDir) return [3 /*break*/, 5];
|
|
124
|
+
return [4 /*yield*/, (0, util_2.appmapDirFromConfig)()];
|
|
125
|
+
case 4:
|
|
126
|
+
appmapDir = _c.sent();
|
|
127
|
+
throw new errors_1.ValidationError('--appmap-dir is required');
|
|
128
|
+
case 5: return [4 /*yield*/, (0, validateFile_1.default)('directory', appmapDir)];
|
|
129
|
+
case 6:
|
|
121
130
|
_c.sent();
|
|
122
131
|
return [4 /*yield*/, (0, resolveAppId_1.default)(appIdArg, appmapDir)];
|
|
123
|
-
case
|
|
132
|
+
case 7:
|
|
124
133
|
appId = _c.sent();
|
|
125
134
|
glob = (0, util_1.promisify)(glob_1.glob);
|
|
126
135
|
return [4 /*yield*/, glob("".concat(appmapDir, "/**/*.appmap.json"))];
|
|
127
|
-
case
|
|
136
|
+
case 8:
|
|
128
137
|
files = _c.sent();
|
|
129
138
|
return [4 /*yield*/, (0, configurationProvider_1.parseConfigFile)(config)];
|
|
130
|
-
case
|
|
139
|
+
case 9:
|
|
131
140
|
configData = _c.sent();
|
|
132
141
|
return [4 /*yield*/, (0, scanner_1.default)(false, configData, files)];
|
|
133
|
-
case
|
|
142
|
+
case 10:
|
|
134
143
|
scanner = _c.sent();
|
|
135
144
|
return [4 /*yield*/, Promise.all([scanner.scan(), scanner.fetchFindingStatus(appIdArg, appmapDir)])];
|
|
136
|
-
case
|
|
145
|
+
case 11:
|
|
137
146
|
_b = __read.apply(void 0, [_c.sent(), 2]), rawScanResults = _b[0], findingStatuses = _b[1];
|
|
138
147
|
// Always report the raw data
|
|
139
148
|
return [4 /*yield*/, (0, promises_1.writeFile)(reportFile, JSON.stringify(rawScanResults, null, 2))];
|
|
140
|
-
case
|
|
149
|
+
case 12:
|
|
141
150
|
// Always report the raw data
|
|
142
151
|
_c.sent();
|
|
143
152
|
scanResults = rawScanResults.withFindings((0, findings_1.newFindings)(rawScanResults.findings, findingStatuses));
|
|
144
153
|
(0, findingsReport_1.default)(scanResults.findings, scanResults.appMapMetadata);
|
|
145
154
|
(0, summaryReport_1.default)(scanResults, true);
|
|
146
|
-
if (!doUpload) return [3 /*break*/,
|
|
155
|
+
if (!doUpload) return [3 /*break*/, 14];
|
|
147
156
|
return [4 /*yield*/, (0, upload_1.default)(rawScanResults, appId, appmapDir, mergeKey, {
|
|
148
157
|
branch: branch,
|
|
149
158
|
commit: commit,
|
|
@@ -151,22 +160,22 @@ exports.default = {
|
|
|
151
160
|
}, {
|
|
152
161
|
maxRetries: 3,
|
|
153
162
|
})];
|
|
154
|
-
case
|
|
163
|
+
case 13:
|
|
155
164
|
uploadResponse = _c.sent();
|
|
156
165
|
(0, reportUploadURL_1.default)(uploadResponse.summary.numFindings, uploadResponse.url);
|
|
157
|
-
_c.label =
|
|
158
|
-
case
|
|
159
|
-
if (!updateCommitStatusOption) return [3 /*break*/,
|
|
166
|
+
_c.label = 14;
|
|
167
|
+
case 14:
|
|
168
|
+
if (!updateCommitStatusOption) return [3 /*break*/, 16];
|
|
160
169
|
return [4 /*yield*/, (0, updateCommitStatus_1.default)(scanResults.findings.length, scanResults.summary.numChecks)];
|
|
161
|
-
case
|
|
170
|
+
case 15:
|
|
162
171
|
_c.sent();
|
|
163
|
-
_c.label =
|
|
164
|
-
case
|
|
172
|
+
_c.label = 16;
|
|
173
|
+
case 16:
|
|
165
174
|
if (failOption) {
|
|
166
175
|
(0, fail_1.default)(scanResults.findings.length);
|
|
167
176
|
}
|
|
168
|
-
return [3 /*break*/,
|
|
169
|
-
case
|
|
177
|
+
return [3 /*break*/, 18];
|
|
178
|
+
case 17:
|
|
170
179
|
err_1 = _c.sent();
|
|
171
180
|
if (err_1 instanceof errors_1.ValidationError) {
|
|
172
181
|
console.warn(err_1.message);
|
|
@@ -180,7 +189,7 @@ exports.default = {
|
|
|
180
189
|
return [2 /*return*/, process.exit(exitCode_1.ExitCode.RuntimeError)];
|
|
181
190
|
}
|
|
182
191
|
throw err_1;
|
|
183
|
-
case
|
|
192
|
+
case 18: return [2 /*return*/];
|
|
184
193
|
}
|
|
185
194
|
});
|
|
186
195
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/ci/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4C;AAC5C,wCAAwC;AACxC,6BAAiC;AAKjC,mFAA4E;AAC5E,uCAA2D;AAE3D,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/ci/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,7 +105,7 @@ exports.default = {
|
|
|
105
105
|
builder: function (args) {
|
|
106
106
|
(0, scanArgs_1.default)(args);
|
|
107
107
|
args.option('appmap-file', {
|
|
108
|
-
describe: 'single file to scan',
|
|
108
|
+
describe: 'single file to scan, or repeat this option to scan multiple specific files',
|
|
109
109
|
alias: 'f',
|
|
110
110
|
});
|
|
111
111
|
args.option('ide', {
|
|
@@ -121,11 +121,13 @@ exports.default = {
|
|
|
121
121
|
},
|
|
122
122
|
handler: function (options) {
|
|
123
123
|
return __awaiter(this, void 0, void 0, function () {
|
|
124
|
-
var
|
|
124
|
+
var appmapDir, _a, appmapFile, config, isVerbose, reportAllFindings, appIdArg, apiKey, ide, reportFile, appId, files, glob, configData, scanner, startTime, _b, rawScanResults, findingStatuses, scanResults, elapsed, numChecks;
|
|
125
|
+
var _this = this;
|
|
125
126
|
return __generator(this, function (_c) {
|
|
126
127
|
switch (_c.label) {
|
|
127
128
|
case 0:
|
|
128
|
-
|
|
129
|
+
appmapDir = options.appmapDir;
|
|
130
|
+
_a = options, appmapFile = _a.appmapFile, config = _a.config, isVerbose = _a.verbose, reportAllFindings = _a.all, appIdArg = _a.app, apiKey = _a.apiKey, ide = _a.ide, reportFile = _a.reportFile;
|
|
129
131
|
if (isVerbose) {
|
|
130
132
|
(0, util_2.verbose)(true);
|
|
131
133
|
}
|
|
@@ -135,51 +137,59 @@ exports.default = {
|
|
|
135
137
|
if (appmapFile && appmapDir) {
|
|
136
138
|
throw new errors_1.ValidationError('Use --appmap-dir or --appmap-file, but not both');
|
|
137
139
|
}
|
|
140
|
+
if (!(!appmapFile && !appmapDir)) return [3 /*break*/, 2];
|
|
141
|
+
return [4 /*yield*/, (0, util_2.appmapDirFromConfig)()];
|
|
142
|
+
case 1:
|
|
143
|
+
appmapDir = _c.sent();
|
|
144
|
+
_c.label = 2;
|
|
145
|
+
case 2:
|
|
138
146
|
if (!appmapFile && !appmapDir) {
|
|
139
147
|
throw new errors_1.ValidationError('Either --appmap-dir or --appmap-file is required');
|
|
140
148
|
}
|
|
141
149
|
appId = appIdArg;
|
|
142
|
-
if (!!reportAllFindings) return [3 /*break*/,
|
|
150
|
+
if (!!reportAllFindings) return [3 /*break*/, 4];
|
|
143
151
|
return [4 /*yield*/, (0, resolveAppId_1.default)(appIdArg, appmapDir)];
|
|
144
|
-
case
|
|
152
|
+
case 3:
|
|
145
153
|
appId = _c.sent();
|
|
146
|
-
_c.label =
|
|
147
|
-
case
|
|
154
|
+
_c.label = 4;
|
|
155
|
+
case 4:
|
|
148
156
|
files = [];
|
|
149
|
-
if (!appmapDir) return [3 /*break*/,
|
|
157
|
+
if (!appmapDir) return [3 /*break*/, 7];
|
|
150
158
|
return [4 /*yield*/, (0, validateFile_1.default)('directory', appmapDir)];
|
|
151
|
-
case
|
|
159
|
+
case 5:
|
|
152
160
|
_c.sent();
|
|
153
161
|
glob = (0, util_1.promisify)(glob_1.glob);
|
|
154
162
|
return [4 /*yield*/, glob("".concat(appmapDir, "/**/*.appmap.json"))];
|
|
155
|
-
case 4:
|
|
156
|
-
files = _c.sent();
|
|
157
|
-
_c.label = 5;
|
|
158
|
-
case 5:
|
|
159
|
-
if (!appmapFile) return [3 /*break*/, 7];
|
|
160
|
-
return [4 /*yield*/, (0, validateFile_1.default)('file', appmapFile)];
|
|
161
163
|
case 6:
|
|
162
|
-
_c.sent();
|
|
163
|
-
files = [appmapFile];
|
|
164
|
+
files = _c.sent();
|
|
164
165
|
_c.label = 7;
|
|
165
|
-
case 7:
|
|
166
|
+
case 7:
|
|
167
|
+
if (!appmapFile) return [3 /*break*/, 9];
|
|
168
|
+
files = typeof appmapFile === 'string' ? [appmapFile] : appmapFile;
|
|
169
|
+
return [4 /*yield*/, Promise.all(files.map(function (file) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
170
|
+
return [2 /*return*/, (0, validateFile_1.default)('file', file)];
|
|
171
|
+
}); }); }))];
|
|
166
172
|
case 8:
|
|
173
|
+
_c.sent();
|
|
174
|
+
_c.label = 9;
|
|
175
|
+
case 9: return [4 /*yield*/, (0, configurationProvider_1.parseConfigFile)(config)];
|
|
176
|
+
case 10:
|
|
167
177
|
configData = _c.sent();
|
|
168
178
|
return [4 /*yield*/, (0, scanner_1.default)(reportAllFindings, configData, files).catch(function (error) {
|
|
169
179
|
throw new errors_1.ValidationError(error.message + '\nUse --all to perform an offline scan.');
|
|
170
180
|
})];
|
|
171
|
-
case
|
|
181
|
+
case 11:
|
|
172
182
|
scanner = _c.sent();
|
|
173
183
|
startTime = Date.now();
|
|
174
184
|
return [4 /*yield*/, Promise.all([
|
|
175
185
|
scanner.scan(),
|
|
176
186
|
scanner.fetchFindingStatus(appId, appmapDir),
|
|
177
187
|
])];
|
|
178
|
-
case
|
|
188
|
+
case 12:
|
|
179
189
|
_b = __read.apply(void 0, [_c.sent(), 2]), rawScanResults = _b[0], findingStatuses = _b[1];
|
|
180
190
|
// Always report the raw data
|
|
181
191
|
return [4 /*yield*/, (0, promises_1.writeFile)(reportFile, formatReport(rawScanResults))];
|
|
182
|
-
case
|
|
192
|
+
case 13:
|
|
183
193
|
// Always report the raw data
|
|
184
194
|
_c.sent();
|
|
185
195
|
if (reportAllFindings) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/scan/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4C;AAC5C,wCAAwC;AACxC,6BAAiC;AAGjC,mFAA4E;AAC5E,uCAA+C;AAE/C,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/scan/command.ts"],"names":[],"mappings":"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"}
|
package/built/cli/scanArgs.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
var path_1 = require("path");
|
|
4
3
|
function default_1(args) {
|
|
5
4
|
args.option('appmap-dir', {
|
|
6
5
|
describe: 'directory to recursively inspect for AppMaps',
|
|
@@ -8,12 +7,12 @@ function default_1(args) {
|
|
|
8
7
|
});
|
|
9
8
|
args.option('config', {
|
|
10
9
|
describe: 'path to assertions config file (TypeScript or YAML, check docs for configuration format)',
|
|
11
|
-
default:
|
|
10
|
+
default: 'appmap-scanner.yml',
|
|
12
11
|
alias: 'c',
|
|
13
12
|
});
|
|
14
13
|
args.option('report-file', {
|
|
15
14
|
describe: 'file name for findings report',
|
|
16
|
-
default: '
|
|
15
|
+
default: 'appmap-findings.json',
|
|
17
16
|
});
|
|
18
17
|
args.option('api-key', {
|
|
19
18
|
describe: 'AppMap server API key. Use of this option is discouraged; set APPLAND_API_KEY instead',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanArgs.js","sourceRoot":"","sources":["../../src/cli/scanArgs.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"scanArgs.js","sourceRoot":"","sources":["../../src/cli/scanArgs.ts"],"names":[],"mappings":";;AAEA,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,oBAAoB;QAC7B,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,QAAQ,EAAE,+BAA+B;QACzC,OAAO,EAAE,sBAAsB;KAChC,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"}
|
|
@@ -57,7 +57,7 @@ exports.default = {
|
|
|
57
57
|
});
|
|
58
58
|
args.option('report-file', {
|
|
59
59
|
describe: 'file containing the findings report',
|
|
60
|
-
default: '
|
|
60
|
+
default: 'appmap-findings.json',
|
|
61
61
|
});
|
|
62
62
|
args.option('app', {
|
|
63
63
|
describe: 'name of the app to publish the findings for. By default, this is determined by looking in appmap.yml',
|
|
@@ -1 +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;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,
|
|
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;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,sBAAsB;SAChC,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"}
|
|
@@ -73,6 +73,8 @@ var parseRuleDescription_1 = __importDefault(require("../rules/lib/parseRuleDesc
|
|
|
73
73
|
var options_json_1 = __importDefault(require("./schema/options.json"));
|
|
74
74
|
var match_pattern_config_json_1 = __importDefault(require("./schema/match-pattern-config.json"));
|
|
75
75
|
var url_1 = require("url");
|
|
76
|
+
var util_2 = require("util");
|
|
77
|
+
var path_1 = require("path");
|
|
76
78
|
var ajv = new ajv_1.default();
|
|
77
79
|
ajv.addSchema(match_pattern_config_json_1.default);
|
|
78
80
|
function loadFromFile(ruleName) {
|
|
@@ -280,10 +282,14 @@ function parseConfigFile(configPath) {
|
|
|
280
282
|
var yamlConfig;
|
|
281
283
|
return __generator(this, function (_a) {
|
|
282
284
|
switch (_a.label) {
|
|
283
|
-
case 0:
|
|
285
|
+
case 0: return [4 /*yield*/, (0, util_2.promisify)(fs_1.exists)(configPath)];
|
|
286
|
+
case 1:
|
|
287
|
+
if (!(_a.sent())) {
|
|
288
|
+
configPath = (0, path_1.join)(__dirname, '../sampleConfig/default.yml');
|
|
289
|
+
}
|
|
284
290
|
console.log("Using scanner configuration file ".concat(configPath));
|
|
285
291
|
return [4 /*yield*/, fs_1.promises.readFile(configPath, 'utf-8')];
|
|
286
|
-
case
|
|
292
|
+
case 2:
|
|
287
293
|
yamlConfig = _a.sent();
|
|
288
294
|
return [2 /*return*/, js_yaml_1.default.load(yamlConfig, {
|
|
289
295
|
filename: configPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurationProvider.js","sourceRoot":"","sources":["../../src/configuration/configurationProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4CAAsB;AACtB,oDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"configurationProvider.js","sourceRoot":"","sources":["../../src/configuration/configurationProvider.ts"],"names":[],"mappings":"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"}
|
package/built/rules/lib/util.js
CHANGED
|
@@ -1,7 +1,70 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
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;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
2
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.verbose = exports.toRegExpArray = exports.responseContentType = exports.toRegExp = exports.providesAuthentication = exports.pluralize = exports.dasherize = exports.camelize = exports.parseValue = exports.isRoot = exports.ideLink = exports.isTruthy = exports.isFalsey = exports.emptyValue = exports.capitalize = exports.appMapDir = void 0;
|
|
39
|
+
exports.verbose = exports.toRegExpArray = exports.responseContentType = exports.toRegExp = exports.providesAuthentication = exports.pluralize = exports.dasherize = exports.camelize = exports.parseValue = exports.isRoot = exports.ideLink = exports.isTruthy = exports.isFalsey = exports.emptyValue = exports.capitalize = exports.appMapDir = exports.appmapDirFromConfig = void 0;
|
|
40
|
+
var fs_1 = require("fs");
|
|
41
|
+
var promises_1 = require("fs/promises");
|
|
42
|
+
var js_yaml_1 = require("js-yaml");
|
|
4
43
|
var path_1 = require("path");
|
|
44
|
+
var util_1 = require("util");
|
|
45
|
+
function appmapDirFromConfig() {
|
|
46
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
47
|
+
var appMapConfigExists, appMapConfigData, _a;
|
|
48
|
+
return __generator(this, function (_b) {
|
|
49
|
+
switch (_b.label) {
|
|
50
|
+
case 0: return [4 /*yield*/, (0, util_1.promisify)(fs_1.exists)('appmap.yml')];
|
|
51
|
+
case 1:
|
|
52
|
+
appMapConfigExists = _b.sent();
|
|
53
|
+
if (!appMapConfigExists) return [3 /*break*/, 3];
|
|
54
|
+
_a = js_yaml_1.load;
|
|
55
|
+
return [4 /*yield*/, (0, promises_1.readFile)('appmap.yml')];
|
|
56
|
+
case 2:
|
|
57
|
+
appMapConfigData = _a.apply(void 0, [(_b.sent()).toString()]);
|
|
58
|
+
if (appMapConfigData && typeof appMapConfigData === 'object') {
|
|
59
|
+
return [2 /*return*/, appMapConfigData['appmap_dir']];
|
|
60
|
+
}
|
|
61
|
+
_b.label = 3;
|
|
62
|
+
case 3: return [2 /*return*/];
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
exports.appmapDirFromConfig = appmapDirFromConfig;
|
|
5
68
|
var isVerbose = false;
|
|
6
69
|
function verbose(v) {
|
|
7
70
|
if (v === void 0) { v = null; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/rules/lib/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/rules/lib/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/scanner",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.55.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"files": [
|
|
@@ -77,7 +77,6 @@
|
|
|
77
77
|
"publishConfig": {
|
|
78
78
|
"access": "public"
|
|
79
79
|
},
|
|
80
|
-
"packageManager": "yarn@3.1.0",
|
|
81
80
|
"pkg": {
|
|
82
81
|
"targets": [
|
|
83
82
|
"node14-linux-x64",
|