@appland/scanner 1.54.0 → 1.56.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 +24 -0
- package/built/cli/ci/command.js +33 -24
- package/built/cli/ci/command.js.map +1 -1
- package/built/cli/scan/command.js +49 -182
- package/built/cli/scan/command.js.map +1 -1
- package/built/cli/scan/formatReport.js +117 -0
- package/built/cli/scan/formatReport.js.map +1 -0
- package/built/cli/scan/singleScan.js +128 -0
- package/built/cli/scan/singleScan.js.map +1 -0
- package/built/cli/scan/watchScan.js +134 -0
- package/built/cli/scan/watchScan.js.map +1 -0
- package/built/cli/scan.js +9 -10
- package/built/cli/scan.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/cli/validateFile.js +9 -5
- package/built/cli/validateFile.js.map +1 -1
- package/built/configuration/configurationProvider.js +9 -3
- package/built/configuration/configurationProvider.js.map +1 -1
- package/built/integration/appland/app/listFindingStatus.js +2 -2
- package/built/integration/appland/app/listFindingStatus.js.map +1 -1
- package/built/rules/lib/util.js +64 -1
- package/built/rules/lib/util.js.map +1 -1
- package/built/rules/secretInLog.js +3 -3
- package/built/rules/secretInLog.js.map +1 -1
- package/package.json +4 -2
|
@@ -0,0 +1,128 @@
|
|
|
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
|
+
};
|
|
38
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
39
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
40
|
+
if (!m) return o;
|
|
41
|
+
var i = m.call(o), r, ar = [], e;
|
|
42
|
+
try {
|
|
43
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
44
|
+
}
|
|
45
|
+
catch (error) { e = { error: error }; }
|
|
46
|
+
finally {
|
|
47
|
+
try {
|
|
48
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
49
|
+
}
|
|
50
|
+
finally { if (e) throw e.error; }
|
|
51
|
+
}
|
|
52
|
+
return ar;
|
|
53
|
+
};
|
|
54
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
55
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
56
|
+
};
|
|
57
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
58
|
+
var util_1 = require("util");
|
|
59
|
+
var promises_1 = require("fs/promises");
|
|
60
|
+
var glob_1 = require("glob");
|
|
61
|
+
var validateFile_1 = __importDefault(require("../validateFile"));
|
|
62
|
+
var scanner_1 = __importDefault(require("./scanner"));
|
|
63
|
+
var errors_1 = require("../../errors");
|
|
64
|
+
var findings_1 = require("../../findings");
|
|
65
|
+
var findingsReport_1 = __importDefault(require("../../report/findingsReport"));
|
|
66
|
+
var summaryReport_1 = __importDefault(require("../../report/summaryReport"));
|
|
67
|
+
var formatReport_1 = require("./formatReport");
|
|
68
|
+
function singleScan(options) {
|
|
69
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
70
|
+
var appmapFile, appmapDir, configData, reportAllFindings, appId, ide, reportFile, files, glob, scanner, startTime, _a, rawScanResults, findingStatuses, scanResults, elapsed, numChecks;
|
|
71
|
+
var _this = this;
|
|
72
|
+
return __generator(this, function (_b) {
|
|
73
|
+
switch (_b.label) {
|
|
74
|
+
case 0:
|
|
75
|
+
appmapFile = options.appmapFile, appmapDir = options.appmapDir, configData = options.configData, reportAllFindings = options.reportAllFindings, appId = options.appId, ide = options.ide, reportFile = options.reportFile;
|
|
76
|
+
files = [];
|
|
77
|
+
if (!appmapDir) return [3 /*break*/, 2];
|
|
78
|
+
glob = (0, util_1.promisify)(glob_1.glob);
|
|
79
|
+
return [4 /*yield*/, glob("".concat(appmapDir, "/**/*.appmap.json"))];
|
|
80
|
+
case 1:
|
|
81
|
+
files = _b.sent();
|
|
82
|
+
_b.label = 2;
|
|
83
|
+
case 2:
|
|
84
|
+
if (!appmapFile) return [3 /*break*/, 4];
|
|
85
|
+
files = typeof appmapFile === 'string' ? [appmapFile] : appmapFile;
|
|
86
|
+
return [4 /*yield*/, Promise.all(files.map(function (file) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
87
|
+
return [2 /*return*/, (0, validateFile_1.default)('file', file)];
|
|
88
|
+
}); }); }))];
|
|
89
|
+
case 3:
|
|
90
|
+
_b.sent();
|
|
91
|
+
_b.label = 4;
|
|
92
|
+
case 4: return [4 /*yield*/, (0, scanner_1.default)(reportAllFindings, configData, files).catch(function (error) {
|
|
93
|
+
throw new errors_1.ValidationError(error.message + '\nUse --all to perform an offline scan.');
|
|
94
|
+
})];
|
|
95
|
+
case 5:
|
|
96
|
+
scanner = _b.sent();
|
|
97
|
+
startTime = Date.now();
|
|
98
|
+
return [4 /*yield*/, Promise.all([
|
|
99
|
+
scanner.scan(),
|
|
100
|
+
scanner.fetchFindingStatus(appId, appmapDir),
|
|
101
|
+
])];
|
|
102
|
+
case 6:
|
|
103
|
+
_a = __read.apply(void 0, [_b.sent(), 2]), rawScanResults = _a[0], findingStatuses = _a[1];
|
|
104
|
+
// Always report the raw data
|
|
105
|
+
return [4 /*yield*/, (0, promises_1.writeFile)(reportFile, (0, formatReport_1.formatReport)(rawScanResults))];
|
|
106
|
+
case 7:
|
|
107
|
+
// Always report the raw data
|
|
108
|
+
_b.sent();
|
|
109
|
+
if (reportAllFindings) {
|
|
110
|
+
scanResults = rawScanResults;
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
scanResults = rawScanResults.withFindings((0, findings_1.newFindings)(rawScanResults.findings, findingStatuses));
|
|
114
|
+
}
|
|
115
|
+
(0, findingsReport_1.default)(scanResults.findings, scanResults.appMapMetadata, ide);
|
|
116
|
+
console.log();
|
|
117
|
+
(0, summaryReport_1.default)(scanResults, true);
|
|
118
|
+
console.log('\n');
|
|
119
|
+
elapsed = Date.now() - startTime;
|
|
120
|
+
numChecks = scanResults.checks.length * scanResults.summary.numAppMaps;
|
|
121
|
+
console.log("Performed ".concat(numChecks, " checks in ").concat(elapsed, "ms (").concat(Math.floor(numChecks / (elapsed / 1000.0)), " checks/sec)"));
|
|
122
|
+
return [2 /*return*/];
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
exports.default = singleScan;
|
|
128
|
+
//# sourceMappingURL=singleScan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"singleScan.js","sourceRoot":"","sources":["../../../src/cli/scan/singleScan.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
35
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
36
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
37
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
38
|
+
function step(op) {
|
|
39
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
40
|
+
while (_) try {
|
|
41
|
+
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;
|
|
42
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
43
|
+
switch (op[0]) {
|
|
44
|
+
case 0: case 1: t = op; break;
|
|
45
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
46
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
47
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
48
|
+
default:
|
|
49
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
50
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
51
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
52
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
53
|
+
if (t[2]) _.ops.pop();
|
|
54
|
+
_.trys.pop(); continue;
|
|
55
|
+
}
|
|
56
|
+
op = body.call(thisArg, _);
|
|
57
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
58
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
62
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
63
|
+
};
|
|
64
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
65
|
+
exports.Watcher = void 0;
|
|
66
|
+
var promises_1 = require("fs/promises");
|
|
67
|
+
var chokidar = __importStar(require("chokidar"));
|
|
68
|
+
var formatReport_1 = require("./formatReport");
|
|
69
|
+
var scanner_1 = __importDefault(require("./scanner"));
|
|
70
|
+
var fs_1 = require("fs");
|
|
71
|
+
var util_1 = require("util");
|
|
72
|
+
var Watcher = /** @class */ (function () {
|
|
73
|
+
function Watcher(options) {
|
|
74
|
+
this.options = options;
|
|
75
|
+
}
|
|
76
|
+
Watcher.prototype.watch = function () {
|
|
77
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
78
|
+
return __generator(this, function (_a) {
|
|
79
|
+
this.watcher = chokidar.watch("".concat(this.options.appmapDir, "/**/mtime"), {
|
|
80
|
+
ignoreInitial: true,
|
|
81
|
+
});
|
|
82
|
+
this.watcher.on('add', this.scan.bind(this)).on('change', this.scan.bind(this));
|
|
83
|
+
return [2 /*return*/];
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
};
|
|
87
|
+
Watcher.prototype.abort = function () {
|
|
88
|
+
if (!this.watcher)
|
|
89
|
+
return;
|
|
90
|
+
this.watcher.close();
|
|
91
|
+
this.watcher = undefined;
|
|
92
|
+
};
|
|
93
|
+
Watcher.prototype.scan = function (fileName) {
|
|
94
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
95
|
+
var pathTokens, appmapDir, appmapFile, reportFile, scanner, rawScanResults;
|
|
96
|
+
return __generator(this, function (_a) {
|
|
97
|
+
switch (_a.label) {
|
|
98
|
+
case 0:
|
|
99
|
+
pathTokens = fileName.split('/');
|
|
100
|
+
appmapDir = pathTokens.slice(0, pathTokens.length - 1).join('/');
|
|
101
|
+
appmapFile = [appmapDir, 'appmap.json'].join('.');
|
|
102
|
+
reportFile = [appmapDir, 'appmap-findings.json'].join('/');
|
|
103
|
+
return [4 /*yield*/, (0, util_1.promisify)(fs_1.exists)(appmapFile)];
|
|
104
|
+
case 1:
|
|
105
|
+
if (!(_a.sent()))
|
|
106
|
+
return [2 /*return*/];
|
|
107
|
+
return [4 /*yield*/, (0, scanner_1.default)(true, this.options.configData, [appmapFile])];
|
|
108
|
+
case 2:
|
|
109
|
+
scanner = _a.sent();
|
|
110
|
+
return [4 /*yield*/, scanner.scan()];
|
|
111
|
+
case 3:
|
|
112
|
+
rawScanResults = _a.sent();
|
|
113
|
+
// Always report the raw data
|
|
114
|
+
return [4 /*yield*/, (0, promises_1.writeFile)(reportFile, (0, formatReport_1.formatReport)(rawScanResults))];
|
|
115
|
+
case 4:
|
|
116
|
+
// Always report the raw data
|
|
117
|
+
_a.sent();
|
|
118
|
+
return [2 /*return*/];
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
};
|
|
123
|
+
return Watcher;
|
|
124
|
+
}());
|
|
125
|
+
exports.Watcher = Watcher;
|
|
126
|
+
function watchScan(options) {
|
|
127
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
128
|
+
return __generator(this, function (_a) {
|
|
129
|
+
return [2 /*return*/, new Watcher(options).watch()];
|
|
130
|
+
});
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
exports.default = watchScan;
|
|
134
|
+
//# sourceMappingURL=watchScan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"watchScan.js","sourceRoot":"","sources":["../../../src/cli/scan/watchScan.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAwC;AACxC,iDAAqC;AAKrC,+CAA8C;AAC9C,sDAAoD;AACpD,yBAA4B;AAC5B,6BAAiC;AAOjC;IAGE,iBAAoB,OAAyB;QAAzB,YAAO,GAAP,OAAO,CAAkB;IAAG,CAAC;IAE3C,uBAAK,GAAX;;;gBACE,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAG,IAAI,CAAC,OAAO,CAAC,SAAS,cAAW,EAAE;oBAClE,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;;;;KACjF;IAED,uBAAK,GAAL;QACE,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO;QAE1B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;IAC3B,CAAC;IAEK,sBAAI,GAAV,UAAW,QAAgB;;;;;;wBACnB,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACjC,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBACjE,UAAU,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBAClD,UAAU,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBAE3D,qBAAM,IAAA,gBAAS,EAAC,WAAM,CAAC,CAAC,UAAU,CAAC,EAAA;;wBAAzC,IAAI,CAAC,CAAC,SAAmC,CAAC;4BAAE,sBAAO;wBAEnC,qBAAM,IAAA,iBAAY,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC,EAAA;;wBAAzE,OAAO,GAAG,SAA+D;wBAExD,qBAAM,OAAO,CAAC,IAAI,EAAE,EAAA;;wBAArC,cAAc,GAAG,SAAoB;wBAE3C,6BAA6B;wBAC7B,qBAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,IAAA,2BAAY,EAAC,cAAc,CAAC,CAAC,EAAA;;wBADzD,6BAA6B;wBAC7B,SAAyD,CAAC;;;;;KAC3D;IACH,cAAC;AAAD,CAAC,AAlCD,IAkCC;AAlCY,0BAAO;AAoCpB,SAA8B,SAAS,CAAC,OAAyB;;;YAC/D,sBAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAC;;;CACrC;AAFD,4BAEC"}
|
package/built/cli/scan.js
CHANGED
|
@@ -93,11 +93,12 @@ function scan(files, checks) {
|
|
|
93
93
|
return __awaiter(this, void 0, void 0, function () {
|
|
94
94
|
function newProgress() {
|
|
95
95
|
if (process.stdout.isTTY) {
|
|
96
|
-
return new cli_progress_1.default.SingleBar({ format: "Scanning [{bar}] {percentage}% | {value}/{total}"
|
|
96
|
+
return new cli_progress_1.default.SingleBar({ format: "Scanning [{bar}] {percentage}% | {value}/{total}" }, cli_progress_1.default.Presets.shades_classic);
|
|
97
97
|
}
|
|
98
98
|
return {
|
|
99
99
|
increment: function () { },
|
|
100
100
|
start: function () { },
|
|
101
|
+
stop: function () { },
|
|
101
102
|
};
|
|
102
103
|
}
|
|
103
104
|
var checker, appMapMetadata, findings, progress;
|
|
@@ -105,6 +106,10 @@ function scan(files, checks) {
|
|
|
105
106
|
return __generator(this, function (_a) {
|
|
106
107
|
switch (_a.label) {
|
|
107
108
|
case 0:
|
|
109
|
+
// TODO: Improve this by respecting .gitignore, or similar.
|
|
110
|
+
// For now, this addresses the main problem of encountering appmap-js and its appmap.json files
|
|
111
|
+
// in a bundled node_modules.
|
|
112
|
+
files = files.filter(function (file) { return !file.split('/').includes('node_modules'); });
|
|
108
113
|
checker = new ruleChecker_1.default();
|
|
109
114
|
appMapMetadata = {};
|
|
110
115
|
findings = [];
|
|
@@ -115,14 +120,7 @@ function scan(files, checks) {
|
|
|
115
120
|
var _this = this;
|
|
116
121
|
return __generator(this, function (_a) {
|
|
117
122
|
switch (_a.label) {
|
|
118
|
-
case 0:
|
|
119
|
-
// TODO: Improve this by respecting .gitignore, or similar.
|
|
120
|
-
// For now, this addresses the main problem of encountering appmap-js and its appmap.json files
|
|
121
|
-
// in a bundled node_modules.
|
|
122
|
-
if (file.split('/').includes('node_modules')) {
|
|
123
|
-
return [2 /*return*/, null];
|
|
124
|
-
}
|
|
125
|
-
return [4 /*yield*/, (0, promises_1.readFile)(file, 'utf8')];
|
|
123
|
+
case 0: return [4 /*yield*/, (0, promises_1.readFile)(file, 'utf8')];
|
|
126
124
|
case 1:
|
|
127
125
|
appMapData = _a.sent();
|
|
128
126
|
appMap = (0, models_1.buildAppMap)(appMapData).normalize().build();
|
|
@@ -146,12 +144,13 @@ function scan(files, checks) {
|
|
|
146
144
|
}); }))];
|
|
147
145
|
case 2:
|
|
148
146
|
_a.sent();
|
|
149
|
-
return [2 /*return
|
|
147
|
+
return [2 /*return*/, null];
|
|
150
148
|
}
|
|
151
149
|
});
|
|
152
150
|
}); })];
|
|
153
151
|
case 1:
|
|
154
152
|
_a.sent();
|
|
153
|
+
progress.stop();
|
|
155
154
|
return [2 /*return*/, { appMapMetadata: appMapMetadata, findings: findings }];
|
|
156
155
|
}
|
|
157
156
|
});
|
package/built/cli/scan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/cli/scan.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAyD;AACzD,8DAAuC;AACvC,wCAAuC;AACvC,0CAAwD;AAGxD,+DAAyC;AAGzC,+DAAyC;AAOzC,SAAe,KAAK,CAClB,KAAmB,EACnB,IAAY,EACZ,OAAmD;;;;;;oBAE7C,IAAI,4BAAO,KAAK,SAAC,CAAC;;;yBACjB,IAAI,CAAC,MAAM;oBAAE,qBAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAA;;oBAApD,SAAoD,CAAC;;;;;;CAC1E;AAED,SAA8B,IAAI,CAAC,KAAe,EAAE,MAAe;;
|
|
1
|
+
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/cli/scan.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"}
|
|
@@ -49,15 +49,19 @@ function default_1(kind, path) {
|
|
|
49
49
|
return __generator(this, function (_b) {
|
|
50
50
|
switch (_b.label) {
|
|
51
51
|
case 0:
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
if (path === '.')
|
|
53
|
+
return [2 /*return*/];
|
|
54
|
+
_b.label = 1;
|
|
54
55
|
case 1:
|
|
55
|
-
_b.
|
|
56
|
-
return [
|
|
56
|
+
_b.trys.push([1, 3, , 4]);
|
|
57
|
+
return [4 /*yield*/, (0, promises_1.access)(path, fs_1.constants.R_OK)];
|
|
57
58
|
case 2:
|
|
59
|
+
_b.sent();
|
|
60
|
+
return [3 /*break*/, 4];
|
|
61
|
+
case 3:
|
|
58
62
|
_a = _b.sent();
|
|
59
63
|
throw new errors_1.ValidationError("AppMap ".concat(kind, " ").concat(chalk_1.default.red(path), " does not exist, or is not readable."));
|
|
60
|
-
case
|
|
64
|
+
case 4: return [2 /*return*/];
|
|
61
65
|
}
|
|
62
66
|
});
|
|
63
67
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateFile.js","sourceRoot":"","sources":["../../src/cli/validateFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,yBAAwD;AACxD,wCAAqC;AACrC,oCAA4C;AAE5C,mBAA+B,IAAY,EAAE,IAAY
|
|
1
|
+
{"version":3,"file":"validateFile.js","sourceRoot":"","sources":["../../src/cli/validateFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,yBAAwD;AACxD,wCAAqC;AACrC,oCAA4C;AAE5C,mBAA+B,IAAY,EAAE,IAAY;;;;;;oBACvD,IAAI,IAAI,KAAK,GAAG;wBAAE,sBAAO;;;;oBAGvB,qBAAM,IAAA,iBAAM,EAAC,IAAgB,EAAE,cAAW,CAAC,IAAI,CAAC,EAAA;;oBAAhD,SAAgD,CAAC;;;;oBAEjD,MAAM,IAAI,wBAAe,CACvB,iBAAU,IAAI,cAAI,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,yCAAsC,CACxE,CAAC;;;;;CAEL;AAVD,4BAUC"}
|
|
@@ -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) {
|
|
@@ -105,7 +107,7 @@ function loadFromDir(ruleName) {
|
|
|
105
107
|
_c.trys.push([0, 2, , 3]);
|
|
106
108
|
return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("../rules/".concat(ruleName, "/metadata"))); })];
|
|
107
109
|
case 1:
|
|
108
|
-
metadata = _c.sent();
|
|
110
|
+
metadata = (_c.sent()).default;
|
|
109
111
|
return [3 /*break*/, 3];
|
|
110
112
|
case 2:
|
|
111
113
|
e_2 = _c.sent();
|
|
@@ -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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"}
|
|
@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
var src_1 = require("@appland/client/dist/src");
|
|
40
|
-
function
|
|
40
|
+
function listFindingStatus(appId) {
|
|
41
41
|
return __awaiter(this, void 0, void 0, function () {
|
|
42
42
|
return __generator(this, function (_a) {
|
|
43
43
|
switch (_a.label) {
|
|
@@ -47,5 +47,5 @@ function default_1(appId) {
|
|
|
47
47
|
});
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
|
-
exports.default =
|
|
50
|
+
exports.default = listFindingStatus;
|
|
51
51
|
//# sourceMappingURL=listFindingStatus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listFindingStatus.js","sourceRoot":"","sources":["../../../../src/integration/appland/app/listFindingStatus.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAsE;AAEtE,
|
|
1
|
+
{"version":3,"file":"listFindingStatus.js","sourceRoot":"","sources":["../../../../src/integration/appland/app/listFindingStatus.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAsE;AAEtE,SAA8B,iBAAiB,CAAC,KAAa;;;;wBACpD,qBAAM,IAAI,SAAG,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,EAAA;wBAA/C,sBAAO,SAAwC,EAAC;;;;CACjD;AAFD,oCAEC"}
|
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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"}
|