@appland/appmap 3.14.3 → 3.14.7
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 +28 -0
- package/built/appmap.html +1 -1
- package/built/main.js.LICENSE.txt +6 -6
- package/built/main.js.map +1 -1
- package/built/package.json +4 -4
- package/built/src/cmds/agentInstaller/agentProcedure.js +3 -2
- package/built/src/cmds/agentInstaller/agentProcedure.js.map +1 -1
- package/built/src/cmds/agentInstaller/commandRunner.js +1 -0
- package/built/src/cmds/agentInstaller/commandRunner.js.map +1 -1
- package/built/src/cmds/agentInstaller/projectConfiguration.js +5 -3
- package/built/src/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/package.json +6 -6
- package/built/src/appland/getAppMap.js +0 -46
- package/built/src/appland/getAppMap.js.map +0 -1
- package/built/src/appland/listAppMaps.js +0 -48
- package/built/src/appland/listAppMaps.js.map +0 -1
- package/built/src/appland/settings.js +0 -46
- package/built/src/appland/settings.js.map +0 -1
package/built/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.14.
|
|
3
|
+
"version": "3.14.7",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/src/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@appland/components": "workspace:*",
|
|
70
70
|
"@appland/diagrams": "workspace:*",
|
|
71
|
-
"@appland/models": "workspace
|
|
71
|
+
"@appland/models": "workspace:^1.8.1",
|
|
72
72
|
"@sidvind/better-ajv-errors": "^0.9.1",
|
|
73
73
|
"@types/moo": "^0.5.5",
|
|
74
74
|
"ajv": "^8.6.3",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"fs-extra": "^9.1.0",
|
|
87
87
|
"glob": "^7.1.6",
|
|
88
88
|
"inquirer": "^8.1.2",
|
|
89
|
-
"js-yaml": "^
|
|
89
|
+
"js-yaml": "^4.0.3",
|
|
90
90
|
"jsdom": "^16.6.0",
|
|
91
91
|
"moo": "^0.5.1",
|
|
92
92
|
"open": "^8.2.1",
|
|
@@ -95,6 +95,6 @@
|
|
|
95
95
|
"ps-node": "^0.1.6",
|
|
96
96
|
"semver": "^7.3.5",
|
|
97
97
|
"w3c-xmlserializer": "^2.0.0",
|
|
98
|
-
"yargs": "^17.
|
|
98
|
+
"yargs": "^17.1.1"
|
|
99
99
|
}
|
|
100
100
|
}
|
|
@@ -20,7 +20,7 @@ class AgentProcedure {
|
|
|
20
20
|
}
|
|
21
21
|
async getEnvironmentForDisplay() {
|
|
22
22
|
// TS is ok with this written as let env:[name: string]: string = {...}, but
|
|
23
|
-
// babel doesn't like it. Splitting it up this way keeps them both happy:
|
|
23
|
+
// babel doesn't like it. Splitting it up this way keeps them both happy:
|
|
24
24
|
let env;
|
|
25
25
|
env = {
|
|
26
26
|
'Project type': this.installer.name,
|
|
@@ -106,7 +106,8 @@ class AgentProcedure {
|
|
|
106
106
|
}
|
|
107
107
|
loadConfig() {
|
|
108
108
|
// yaml.load returns undefined if the input string is empty
|
|
109
|
-
|
|
109
|
+
const configContent = fs_1.default.readFileSync(this.configPath, 'utf8');
|
|
110
|
+
return js_yaml_1.default.load(configContent) || {};
|
|
110
111
|
}
|
|
111
112
|
get configExists() {
|
|
112
113
|
return fs_1.default.existsSync(this.configPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentProcedure.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,+BAAqC;AACrC,sDAA2B;AAC3B,kDAA0B;AAC1B,sCAA4C;AAE5C,yEAAoC;AACpC,mDAA+C;AAC/C,8DAAgE;AAChE,oEAA4C;AAC5C,gEAAwC;AAExC,MAA8B,cAAc;IAC1C,YAAqB,SAAyB,EAAW,IAAY;QAAhD,cAAS,GAAT,SAAS,CAAgB;QAAW,SAAI,GAAJ,IAAI,CAAQ;IAAG,CAAC;IAEzE,KAAK,CAAC,wBAAwB;QAC5B,4EAA4E;QAC5E,
|
|
1
|
+
{"version":3,"file":"agentProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentProcedure.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandRunner.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,7 @@ async function resolveSelectedInstallers(projects, userSpecifiedInstaller) {
|
|
|
75
75
|
* @returns ProjectConfiguration[] if the user chooses to install to subprojects, otherwise
|
|
76
76
|
* undefined
|
|
77
77
|
*/
|
|
78
|
-
async function getSubprojects(dir) {
|
|
78
|
+
async function getSubprojects(dir, rootHasInstaller) {
|
|
79
79
|
const ents = await fs_1.promises.readdir(dir, { withFileTypes: true });
|
|
80
80
|
const subprojects = (await Promise.all(ents.map(async (ent) => {
|
|
81
81
|
if (!ent.isDirectory()) {
|
|
@@ -105,6 +105,7 @@ async function getSubprojects(dir) {
|
|
|
105
105
|
}
|
|
106
106
|
const { addSubprojects } = await userInteraction_1.default.prompt({
|
|
107
107
|
type: 'confirm',
|
|
108
|
+
default: !rootHasInstaller,
|
|
108
109
|
name: 'addSubprojects',
|
|
109
110
|
message: 'This directory contains sub-projects. Would you like to choose sub-projects for installation?',
|
|
110
111
|
});
|
|
@@ -126,8 +127,10 @@ async function getSubprojects(dir) {
|
|
|
126
127
|
}
|
|
127
128
|
async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller) {
|
|
128
129
|
let projectConfigurations = [];
|
|
130
|
+
const availableInstallers = await installers_1.default(dir);
|
|
131
|
+
const rootHasInstaller = !!availableInstallers.length;
|
|
129
132
|
if (allowMulti) {
|
|
130
|
-
const subprojects = await getSubprojects(dir);
|
|
133
|
+
const subprojects = await getSubprojects(dir, rootHasInstaller);
|
|
131
134
|
if (subprojects === null || subprojects === void 0 ? void 0 : subprojects.length) {
|
|
132
135
|
projectConfigurations.push(...subprojects);
|
|
133
136
|
}
|
|
@@ -137,7 +140,6 @@ async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller)
|
|
|
137
140
|
}
|
|
138
141
|
// If there are no subprojects, we will continue by installing to the current directory.
|
|
139
142
|
if (!projectConfigurations.length) {
|
|
140
|
-
const availableInstallers = await installers_1.default(dir);
|
|
141
143
|
if (availableInstallers.length) {
|
|
142
144
|
projectConfigurations = [
|
|
143
145
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.14.
|
|
3
|
+
"version": "3.14.7",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/src/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -66,9 +66,9 @@
|
|
|
66
66
|
"vuex"
|
|
67
67
|
],
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@appland/components": "1.
|
|
70
|
-
"@appland/diagrams": "1.5.
|
|
71
|
-
"@appland/models": "1.
|
|
69
|
+
"@appland/components": "1.18.2",
|
|
70
|
+
"@appland/diagrams": "1.5.1",
|
|
71
|
+
"@appland/models": "^1.8.1",
|
|
72
72
|
"@sidvind/better-ajv-errors": "^0.9.1",
|
|
73
73
|
"@types/moo": "^0.5.5",
|
|
74
74
|
"ajv": "^8.6.3",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"fs-extra": "^9.1.0",
|
|
87
87
|
"glob": "^7.1.6",
|
|
88
88
|
"inquirer": "^8.1.2",
|
|
89
|
-
"js-yaml": "^
|
|
89
|
+
"js-yaml": "^4.0.3",
|
|
90
90
|
"jsdom": "^16.6.0",
|
|
91
91
|
"moo": "^0.5.1",
|
|
92
92
|
"open": "^8.2.1",
|
|
@@ -95,6 +95,6 @@
|
|
|
95
95
|
"ps-node": "^0.1.6",
|
|
96
96
|
"semver": "^7.3.5",
|
|
97
97
|
"w3c-xmlserializer": "^2.0.0",
|
|
98
|
-
"yargs": "^17.
|
|
98
|
+
"yargs": "^17.1.1"
|
|
99
99
|
}
|
|
100
100
|
}
|
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
const { request: httpRequest } = require('http');
|
|
3
|
-
const { request: httpsRequest } = require('https');
|
|
4
|
-
const { baseURL, apiKey, exists } = require('./settings');
|
|
5
|
-
/**
|
|
6
|
-
* Loads AppMap data from UUID.
|
|
7
|
-
*
|
|
8
|
-
* @param {string} uuid
|
|
9
|
-
* @returns {Promise<import('./types').AppMapData>}
|
|
10
|
-
*/
|
|
11
|
-
const getAppMap = async (uuid) => {
|
|
12
|
-
if (!exists) {
|
|
13
|
-
throw new Error(`AppMap client is not configured`);
|
|
14
|
-
}
|
|
15
|
-
return new Promise((resolve, reject) => {
|
|
16
|
-
const getScenarioURL = new URL([baseURL, 'api/appmaps', uuid].join('/'));
|
|
17
|
-
const requestFunction = getScenarioURL.protocol === 'https:' ? httpsRequest : httpRequest;
|
|
18
|
-
const req = requestFunction(getScenarioURL, {
|
|
19
|
-
headers: {
|
|
20
|
-
Authorization: `Bearer ${apiKey}`,
|
|
21
|
-
Accept: 'application/json',
|
|
22
|
-
},
|
|
23
|
-
},
|
|
24
|
-
// eslint-disable-next-line consistent-return
|
|
25
|
-
(res) => {
|
|
26
|
-
if (res.statusCode >= 300) {
|
|
27
|
-
return reject(res.statusCode);
|
|
28
|
-
}
|
|
29
|
-
let data = '';
|
|
30
|
-
res.setEncoding('utf8');
|
|
31
|
-
res.on('data', (chunk) => {
|
|
32
|
-
data += chunk;
|
|
33
|
-
});
|
|
34
|
-
res.on('end', () => {
|
|
35
|
-
resolve(JSON.parse(data));
|
|
36
|
-
});
|
|
37
|
-
});
|
|
38
|
-
req.on('error', (e) => {
|
|
39
|
-
reject(e);
|
|
40
|
-
});
|
|
41
|
-
// Write data to request body
|
|
42
|
-
req.end();
|
|
43
|
-
});
|
|
44
|
-
};
|
|
45
|
-
module.exports = getAppMap;
|
|
46
|
-
//# sourceMappingURL=getAppMap.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getAppMap.js","sourceRoot":"","sources":["../../../src/appland/getAppMap.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjD,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AACnD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,EAAE,EAAE;IAC/B,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACzE,MAAM,eAAe,GACnB,cAAc,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;QACpE,MAAM,GAAG,GAAG,eAAe,CACzB,cAAc,EACd;YACE,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,MAAM,EAAE;gBACjC,MAAM,EAAE,kBAAkB;aAC3B;SACF;QACD,6CAA6C;QAC7C,CAAC,GAAG,EAAE,EAAE;YACN,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE;gBACzB,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aAC/B;YACD,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACxB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvB,IAAI,IAAI,KAAK,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACpB,MAAM,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QAEH,6BAA6B;QAC7B,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC"}
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
const { request: httpRequest } = require('http');
|
|
3
|
-
const { request: httpsRequest } = require('https');
|
|
4
|
-
const { baseURL, apiKey, exists } = require('./settings');
|
|
5
|
-
/** @typedef {import('./types').AppMapListItem} AppMapListItem */
|
|
6
|
-
/**
|
|
7
|
-
* Lists AppMaps in a mapset.
|
|
8
|
-
*
|
|
9
|
-
* @param {number} mapset
|
|
10
|
-
* @returns {Promise<AppMapListItem[]>}
|
|
11
|
-
*/
|
|
12
|
-
const listAppMaps = async (mapset) => {
|
|
13
|
-
if (!exists) {
|
|
14
|
-
throw new Error(`AppMap client is not configured`);
|
|
15
|
-
}
|
|
16
|
-
return new Promise((resolve, reject) => {
|
|
17
|
-
const listAppMapsURL = new URL([baseURL, 'api/appmaps'].join('/'));
|
|
18
|
-
listAppMapsURL.searchParams.append('mapsets[]', mapset.toString());
|
|
19
|
-
const requestFunction = listAppMapsURL.protocol === 'https:' ? httpsRequest : httpRequest;
|
|
20
|
-
const req = requestFunction(listAppMapsURL, {
|
|
21
|
-
headers: {
|
|
22
|
-
Authorization: `Bearer ${apiKey}`,
|
|
23
|
-
Accept: 'application/json',
|
|
24
|
-
},
|
|
25
|
-
},
|
|
26
|
-
// eslint-disable-next-line consistent-return
|
|
27
|
-
(res) => {
|
|
28
|
-
if (res.statusCode >= 300) {
|
|
29
|
-
return reject(res.statusCode);
|
|
30
|
-
}
|
|
31
|
-
let data = '';
|
|
32
|
-
res.setEncoding('utf8');
|
|
33
|
-
res.on('data', (chunk) => {
|
|
34
|
-
data += chunk;
|
|
35
|
-
});
|
|
36
|
-
res.on('end', () => {
|
|
37
|
-
resolve(JSON.parse(data));
|
|
38
|
-
});
|
|
39
|
-
});
|
|
40
|
-
req.on('error', (e) => {
|
|
41
|
-
reject(e);
|
|
42
|
-
});
|
|
43
|
-
// Write data to request body
|
|
44
|
-
req.end();
|
|
45
|
-
});
|
|
46
|
-
};
|
|
47
|
-
module.exports = listAppMaps;
|
|
48
|
-
//# sourceMappingURL=listAppMaps.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"listAppMaps.js","sourceRoot":"","sources":["../../../src/appland/listAppMaps.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjD,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AACnD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAE1D,iEAAiE;AAEjE;;;;;GAKG;AACH,MAAM,WAAW,GAAG,KAAK,EAAE,MAAM,EAAE,EAAE;IACnC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnE,MAAM,eAAe,GACnB,cAAc,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;QACpE,MAAM,GAAG,GAAG,eAAe,CACzB,cAAc,EACd;YACE,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,MAAM,EAAE;gBACjC,MAAM,EAAE,kBAAkB;aAC3B;SACF;QACD,6CAA6C;QAC7C,CAAC,GAAG,EAAE,EAAE;YACN,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE;gBACzB,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aAC/B;YACD,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACxB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvB,IAAI,IAAI,KAAK,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACpB,MAAM,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QAEH,6BAA6B;QAC7B,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
|
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
const { join } = require('path');
|
|
3
|
-
const { homedir } = require('os');
|
|
4
|
-
const { statSync, readFileSync } = require('fs');
|
|
5
|
-
const yaml = require('js-yaml');
|
|
6
|
-
/**
|
|
7
|
-
* @param {string} msg
|
|
8
|
-
* @returns {{baseURL: string, apiKey: string, exists: boolean}}
|
|
9
|
-
*/
|
|
10
|
-
const failUsage = (msg) => {
|
|
11
|
-
console.warn(msg);
|
|
12
|
-
return { baseURL: null, apiKey: null, exists: false };
|
|
13
|
-
};
|
|
14
|
-
const { baseURL, apiKey, exists } =
|
|
15
|
-
/**
|
|
16
|
-
* @returns {{baseURL, apiKey}}
|
|
17
|
-
*/
|
|
18
|
-
(() => {
|
|
19
|
-
const applandConfigFilePath = join(homedir(), '.appland');
|
|
20
|
-
const applandConfigStat = statSync(applandConfigFilePath);
|
|
21
|
-
if (!applandConfigStat.isFile()) {
|
|
22
|
-
return failUsage(`AppMap Cloud config file ${applandConfigFilePath} does not exist`);
|
|
23
|
-
}
|
|
24
|
-
const applandConfig = /** @type {object} */ (yaml.load(readFileSync(applandConfigFilePath).toString()));
|
|
25
|
-
const currentContext =
|
|
26
|
-
/** @type {string} */ applandConfig.current_context || 'default';
|
|
27
|
-
const contextConfig =
|
|
28
|
-
/** @type {import('./types').Context} */ applandConfig.contexts[currentContext];
|
|
29
|
-
if (!contextConfig) {
|
|
30
|
-
return failUsage(`No context configuration '${currentContext}' in AppMap Cloud config file ${applandConfigFilePath}`);
|
|
31
|
-
}
|
|
32
|
-
const { url: configURL, api_key: configApiKey } = contextConfig;
|
|
33
|
-
if (!configURL) {
|
|
34
|
-
return failUsage(`No 'url' in context configuration '${currentContext}' in AppMap Cloud config file ${applandConfigFilePath}`);
|
|
35
|
-
}
|
|
36
|
-
if (!configApiKey) {
|
|
37
|
-
return failUsage(`No 'api_key' in context configuration '${currentContext}' in AppMap Cloud config file ${applandConfigFilePath}`);
|
|
38
|
-
}
|
|
39
|
-
return { baseURL: configURL, apiKey: configApiKey, exists: true };
|
|
40
|
-
})();
|
|
41
|
-
module.exports = {
|
|
42
|
-
baseURL,
|
|
43
|
-
apiKey,
|
|
44
|
-
exists,
|
|
45
|
-
};
|
|
46
|
-
//# sourceMappingURL=settings.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/appland/settings.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAClC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACjD,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEhC;;;GAGG;AACH,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE;IACxB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE;AAC/B;;GAEG;AACH,CAAC,GAAG,EAAE;IACJ,MAAM,qBAAqB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAC;IAC1D,MAAM,iBAAiB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IAC1D,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;QAC/B,OAAO,SAAS,CACd,4BAA4B,qBAAqB,iBAAiB,CACnE,CAAC;KACH;IACD,MAAM,aAAa,GAAG,qBAAqB,CAAC,CAC1C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC1D,CAAC;IACF,MAAM,cAAc;IAClB,qBAAqB,CAAC,aAAa,CAAC,eAAe,IAAI,SAAS,CAAC;IACnE,MAAM,aAAa;IACjB,wCAAwC,CAAC,aAAa,CAAC,QAAQ,CAC7D,cAAc,CACf,CAAC;IACJ,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,SAAS,CACd,6BAA6B,cAAc,iCAAiC,qBAAqB,EAAE,CACpG,CAAC;KACH;IACD,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC;IAChE,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,SAAS,CACd,sCAAsC,cAAc,iCAAiC,qBAAqB,EAAE,CAC7G,CAAC;KACH;IACD,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,SAAS,CACd,0CAA0C,cAAc,iCAAiC,qBAAqB,EAAE,CACjH,CAAC;KACH;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACpE,CAAC,CAAC,EAAE,CAAC;AAEP,MAAM,CAAC,OAAO,GAAG;IACf,OAAO;IACP,MAAM;IACN,MAAM;CACP,CAAC"}
|