@appland/appmap 3.71.0 → 3.73.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 +14 -0
- package/built/cmds/agentInstaller/agentInstaller.js +2 -2
- package/built/cmds/agentInstaller/agentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/agentInstallerProcedure.js +26 -37
- package/built/cmds/agentInstaller/agentInstallerProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/agentProcedure.js +19 -24
- package/built/cmds/agentInstaller/agentProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/agentStatusProcedure.js +4 -5
- package/built/cmds/agentInstaller/agentStatusProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/gradleInstaller.js +10 -23
- package/built/cmds/agentInstaller/gradleInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/install-agent.js +35 -21
- package/built/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/cmds/agentInstaller/installerUI.js +174 -0
- package/built/cmds/agentInstaller/installerUI.js.map +1 -0
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js +4 -4
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/mavenInstaller.js +2 -2
- package/built/cmds/agentInstaller/mavenInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/projectConfiguration.js +12 -36
- package/built/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/built/cmds/agentInstaller/pythonAgentInstaller.js +11 -20
- package/built/cmds/agentInstaller/pythonAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/rubyAgentInstaller.js +2 -2
- package/built/cmds/agentInstaller/rubyAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/status.js +4 -2
- package/built/cmds/agentInstaller/status.js.map +1 -1
- package/built/cmds/stats/stats.js +20 -13
- package/built/cmds/stats/stats.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [@appland/appmap-v3.73.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.72.0...@appland/appmap-v3.73.0) (2023-03-22)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* more robust appmap locating ([c52a390](https://github.com/getappmap/appmap-js/commit/c52a3902edfa214ed4637d0ed8de6932248fceb4))
|
|
7
|
+
|
|
8
|
+
# [@appland/appmap-v3.72.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.71.0...@appland/appmap-v3.72.0) (2023-03-22)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* Non-interactive AppMap installer ([8631211](https://github.com/getappmap/appmap-js/commit/8631211b3cca5b59262f3b1d2ee90792942cf04a))
|
|
14
|
+
|
|
1
15
|
# [@appland/appmap-v3.71.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.70.0...@appland/appmap-v3.71.0) (2023-03-21)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -8,8 +8,8 @@ class AgentInstaller {
|
|
|
8
8
|
this.name = name;
|
|
9
9
|
this.path = (0, path_1.resolve)(path);
|
|
10
10
|
}
|
|
11
|
-
async checkCurrentConfig() {
|
|
12
|
-
const cmd = await this.checkConfigCommand();
|
|
11
|
+
async checkCurrentConfig(ui) {
|
|
12
|
+
const cmd = await this.checkConfigCommand(ui);
|
|
13
13
|
if (!cmd) {
|
|
14
14
|
return;
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstaller.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAC/B,sCAA4C;AAC5C,mDAAsC;
|
|
1
|
+
{"version":3,"file":"agentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstaller.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAC/B,sCAA4C;AAC5C,mDAAsC;AAItC,MAA8B,cAAc;IAM1C,YAAqB,IAAY,EAAE,IAAY;QAA1B,SAAI,GAAJ,IAAI,CAAQ;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAOD,KAAK,CAAC,kBAAkB,CAAC,EAAe;QACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,GAAG,EAAE;YACR,OAAO;SACR;QAED,IAAI;YACF,MAAM,IAAA,mBAAG,EAAC,GAAG,CAAC,CAAC;SAChB;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,wBAAe,CAAC,GAAa,CAAC,CAAC;SAC1C;IACH,CAAC;CAOF;AAjCD,iCAiCC"}
|
|
@@ -8,29 +8,25 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
8
8
|
const yargs_1 = __importDefault(require("yargs"));
|
|
9
9
|
const errors_1 = require("../errors");
|
|
10
10
|
const commandRunner_1 = require("./commandRunner");
|
|
11
|
-
const
|
|
11
|
+
const installerUI_1 = require("./installerUI");
|
|
12
12
|
const agentProcedure_1 = __importDefault(require("./agentProcedure"));
|
|
13
13
|
const telemetry_1 = __importDefault(require("../../telemetry"));
|
|
14
14
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
15
15
|
const ValidationResult_1 = require("./ValidationResult");
|
|
16
16
|
const js_yaml_1 = require("js-yaml");
|
|
17
17
|
class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
18
|
-
async run() {
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
]
|
|
28
|
-
.flat()
|
|
29
|
-
.join('\n'),
|
|
30
|
-
});
|
|
18
|
+
async run(ui) {
|
|
19
|
+
const confirm = ui.confirm([
|
|
20
|
+
`AppMap is about to be installed. Confirm the details below.`,
|
|
21
|
+
await this.getEnvironmentForDisplay(),
|
|
22
|
+
'',
|
|
23
|
+
' Is this correct?',
|
|
24
|
+
]
|
|
25
|
+
.flat()
|
|
26
|
+
.join('\n'));
|
|
31
27
|
if (!confirm) {
|
|
32
|
-
|
|
33
|
-
|
|
28
|
+
ui.status('Aborting installation.');
|
|
29
|
+
ui.error([
|
|
34
30
|
'Modify the installation environment as needed, and re-run the command.',
|
|
35
31
|
`Use ${chalk_1.default.blue('--help')} for more information.`,
|
|
36
32
|
].join('\n'));
|
|
@@ -39,19 +35,11 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
39
35
|
let useExistingAppMapYml = false;
|
|
40
36
|
let existingConfig;
|
|
41
37
|
if (this.configExists) {
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
const ABORT = 'Abort';
|
|
45
|
-
const { overwriteAppMapYml } = await userInteraction_1.default.prompt({
|
|
46
|
-
type: 'list',
|
|
47
|
-
name: 'overwriteAppMapYml',
|
|
48
|
-
message: 'An appmap.yml configuration file already exists. How should the conflict be resolved?',
|
|
49
|
-
choices: [USE_EXISTING, OVERWRITE, ABORT],
|
|
50
|
-
});
|
|
51
|
-
if (overwriteAppMapYml === ABORT) {
|
|
38
|
+
const overwriteAppMapConfig = await ui.overwriteAppMapConfig();
|
|
39
|
+
if (overwriteAppMapConfig === installerUI_1.OverwriteOption.ABORT) {
|
|
52
40
|
yargs_1.default.exit(0, new Error());
|
|
53
41
|
}
|
|
54
|
-
if (
|
|
42
|
+
if (overwriteAppMapConfig === installerUI_1.OverwriteOption.USE_EXISTING) {
|
|
55
43
|
try {
|
|
56
44
|
existingConfig = this.loadConfig();
|
|
57
45
|
useExistingAppMapYml = true;
|
|
@@ -61,15 +49,15 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
61
49
|
}
|
|
62
50
|
}
|
|
63
51
|
}
|
|
64
|
-
|
|
52
|
+
ui.status('Installing AppMap...');
|
|
65
53
|
try {
|
|
66
54
|
const filesBeforeGitStatus = await this.gitStatus();
|
|
67
55
|
const filesBefore = [];
|
|
68
56
|
for (const file of filesBeforeGitStatus) {
|
|
69
57
|
filesBefore.push(file.file);
|
|
70
58
|
}
|
|
71
|
-
await this.installer.checkCurrentConfig();
|
|
72
|
-
await this.installer.installAgent();
|
|
59
|
+
await this.installer.checkCurrentConfig(ui);
|
|
60
|
+
await this.installer.installAgent(ui);
|
|
73
61
|
await this.verifyProject();
|
|
74
62
|
if (!useExistingAppMapYml) {
|
|
75
63
|
const initCommand = await this.installer.initCommand();
|
|
@@ -84,7 +72,7 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
84
72
|
let dirty = false;
|
|
85
73
|
const updateField = (fieldName) => {
|
|
86
74
|
if (!existingConfig[fieldName]) {
|
|
87
|
-
|
|
75
|
+
ui.success(`Updating ${fieldName} in appmap.yml`);
|
|
88
76
|
existingConfig[fieldName] = this.installer[fieldName];
|
|
89
77
|
dirty = true;
|
|
90
78
|
}
|
|
@@ -94,8 +82,9 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
94
82
|
this.writeConfigFile(existingConfig);
|
|
95
83
|
}
|
|
96
84
|
}
|
|
97
|
-
const result = await this.validateProject(useExistingAppMapYml);
|
|
98
|
-
|
|
85
|
+
const result = await this.validateProject(ui, useExistingAppMapYml);
|
|
86
|
+
if (ui.interactive)
|
|
87
|
+
await this.commitConfiguration(ui, filesBefore);
|
|
99
88
|
const successMessage = [
|
|
100
89
|
chalk_1.default.green('Success! AppMap has finished installing.'),
|
|
101
90
|
'',
|
|
@@ -104,10 +93,10 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
104
93
|
'You can consult the AppMap documentation, or continue with the ',
|
|
105
94
|
'instructions provided in the AppMap code editor extension.',
|
|
106
95
|
];
|
|
107
|
-
|
|
96
|
+
ui.success(successMessage.join('\n'));
|
|
108
97
|
if (result === null || result === void 0 ? void 0 : result.errors)
|
|
109
98
|
for (const warning of result.errors.filter((e) => e.level === 'warning'))
|
|
110
|
-
|
|
99
|
+
ui.warn((0, ValidationResult_1.formatValidationError)(warning));
|
|
111
100
|
}
|
|
112
101
|
catch (e) {
|
|
113
102
|
const error = e;
|
|
@@ -132,7 +121,7 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
132
121
|
installer: this.installer.name,
|
|
133
122
|
},
|
|
134
123
|
});
|
|
135
|
-
|
|
124
|
+
ui.error(incompatibleArchitectureMessage.join('\n'));
|
|
136
125
|
}
|
|
137
126
|
else if (error === null || error === void 0 ? void 0 : error.message.includes('without the test and development groups')) {
|
|
138
127
|
const bundlerConfigErrorMessage = [
|
|
@@ -157,7 +146,7 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
157
146
|
installer: this.installer.name,
|
|
158
147
|
},
|
|
159
148
|
});
|
|
160
|
-
|
|
149
|
+
ui.error(bundlerConfigErrorMessage.join('\n'));
|
|
161
150
|
}
|
|
162
151
|
else {
|
|
163
152
|
throw e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,kDAA0B;AAE1B,sCAAuC;AACvC,mDAAsC;AACtC
|
|
1
|
+
{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,kDAA0B;AAE1B,sCAAuC;AACvC,mDAAsC;AACtC,+CAA6D;AAC7D,sEAA8C;AAC9C,gEAAwC;AACxC,oEAA4C;AAC5C,yDAA2D;AAE3D,qCAAqC;AAGrC,MAAqB,uBAAwB,SAAQ,wBAAc;IACjE,KAAK,CAAC,GAAG,CAAC,EAAe;QACvB,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CACxB;YACE,6DAA6D;YAC7D,MAAM,IAAI,CAAC,wBAAwB,EAAE;YACrC,EAAE;YACF,oBAAoB;SACrB;aACE,IAAI,EAAE;aACN,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE;YACZ,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;YACpC,EAAE,CAAC,KAAK,CACN;gBACE,wEAAwE;gBACxE,OAAO,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB;aACpD,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;YACF,MAAM,IAAI,mBAAU,CAAC,mDAAmD,CAAC,CAAC;SAC3E;QAED,IAAI,oBAAoB,GAAG,KAAK,CAAC;QACjC,IAAI,cAAmB,CAAC;QACxB,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,MAAM,qBAAqB,GAAG,MAAM,EAAE,CAAC,qBAAqB,EAAE,CAAC;YAE/D,IAAI,qBAAqB,KAAK,6BAAe,CAAC,KAAK,EAAE;gBACnD,eAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;aAC5B;YAED,IAAI,qBAAqB,KAAK,6BAAe,CAAC,YAAY,EAAE;gBAC1D,IAAI;oBACF,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;oBACnC,oBAAoB,GAAG,IAAI,CAAC;iBAC7B;gBAAC,WAAM;oBACN,MAAM,IAAI,mBAAU,CAClB,uFAAuF,CACxF,CAAC;iBACH;aACF;SACF;QAED,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAElC,IAAI;YACF,MAAM,oBAAoB,GAAgB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACjE,MAAM,WAAW,GAAa,EAAE,CAAC;YACjC,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE;gBACvC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B;YACD,MAAM,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAEtC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE3B,IAAI,CAAC,oBAAoB,EAAE;gBACzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;gBACvD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,mBAAG,EAAC,WAAW,CAAC,CAAC;gBAC1C,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC7C,MAAM,iBAAiB,GAAI,IAAA,cAAI,EAAC,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAS,IAAI,EAAE,CAAC;gBAExF,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;gBACrD,iBAAiB,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;gBAEzD,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;aACzC;iBAAM;gBACL,IAAI,KAAK,GAAG,KAAK,CAAC;gBAClB,MAAM,WAAW,GAAG,CAAC,SAAiB,EAAQ,EAAE;oBAC9C,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;wBAC9B,EAAE,CAAC,OAAO,CAAC,YAAY,SAAS,gBAAgB,CAAC,CAAC;wBAClD,cAAc,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;wBACtD,KAAK,GAAG,IAAI,CAAC;qBACd;gBACH,CAAC,CAAC;gBACF,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAChD,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;iBACtC;aACF;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAC;YAEpE,IAAI,EAAE,CAAC,WAAW;gBAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;YAEpE,MAAM,cAAc,GAAG;gBACrB,eAAK,CAAC,KAAK,CAAC,0CAA0C,CAAC;gBACvD,EAAE;gBACF,eAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC;gBACvC,EAAE;gBACF,iEAAiE;gBACjE,4DAA4D;aAC7D,CAAC;YAEF,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEtC,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM;gBAChB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC;oBACtE,EAAE,CAAC,IAAI,CAAC,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC,CAAC;SAC7C;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,KAAK,GAAG,CAAU,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC;YAC5B,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE;gBACrC,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,QAAQ,CAAC,qCAAqC,CAAC,EAAE;oBAClE,MAAM,IAAA,mBAAG,EAAC,IAAI,uBAAa,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAEzF,MAAM,+BAA+B,GAAG;wBACtC,IAAI;wBACJ,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC;wBAC5C,EAAE;wBACF,+EAA+E;wBAC/E,EAAE;wBACF,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;wBACpB,IAAI;qBACL,CAAC;oBAEF,mBAAS,CAAC,SAAS,CAAC;wBAClB,IAAI,EAAE,2CAA2C;wBACjD,UAAU,EAAE;4BACV,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO;4BACrB,SAAS,EAAE,IAAI,CAAC,IAAI;4BACpB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;yBAC/B;qBACF,CAAC,CAAC;oBAEH,EAAE,CAAC,KAAK,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtD;qBAAM,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,QAAQ,CAAC,yCAAyC,CAAC,EAAE;oBAC7E,MAAM,yBAAyB,GAAG;wBAChC,IAAI;wBACJ,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC;wBAC5C,EAAE;wBACF,mEAAmE;wBACnE,mEAAmE;wBACnE,qDAAqD;wBACrD,EAAE;wBACF,eAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC;wBAC/C,IAAI;wBACJ,8CAA8C;4BAC5C,8CAA8C;wBAChD,EAAE;qBACH,CAAC;oBAEF,mBAAS,CAAC,SAAS,CAAC;wBAClB,IAAI,EAAE,oCAAoC;wBAC1C,UAAU,EAAE;4BACV,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO;4BACrB,SAAS,EAAE,IAAI,CAAC,IAAI;4BACpB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;yBAC/B;qBACF,CAAC,CAAC;oBAEH,EAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAChD;qBAAM;oBACL,MAAM,CAAC,CAAC;iBACT;aACF;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IAED,eAAe,CAAC,MAA2B;QACzC,YAAE,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;CACF;AAtKD,0CAsKC"}
|
|
@@ -8,7 +8,6 @@ const path_1 = require("path");
|
|
|
8
8
|
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
9
9
|
const chalk_1 = __importDefault(require("chalk"));
|
|
10
10
|
const errors_1 = require("../errors");
|
|
11
|
-
const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
12
11
|
const commandRunner_1 = require("./commandRunner");
|
|
13
12
|
const validator_1 = require("../../service/config/validator");
|
|
14
13
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
@@ -58,22 +57,22 @@ class AgentProcedure {
|
|
|
58
57
|
await (0, commandRunner_1.run)(verifyCommand);
|
|
59
58
|
}
|
|
60
59
|
}
|
|
61
|
-
async validateAgent(cmd) {
|
|
60
|
+
async validateAgent(ui, cmd) {
|
|
62
61
|
try {
|
|
63
62
|
return (0, commandRunner_1.run)(cmd);
|
|
64
63
|
}
|
|
65
64
|
catch (e) {
|
|
66
|
-
|
|
65
|
+
ui.error('Failed to validate the installation.');
|
|
67
66
|
throw e;
|
|
68
67
|
}
|
|
69
68
|
}
|
|
70
|
-
async validateProject(checkSyntax) {
|
|
69
|
+
async validateProject(ui, checkSyntax) {
|
|
71
70
|
const validateCmd = await this.installer.validateAgentCommand();
|
|
72
71
|
if (!validateCmd) {
|
|
73
72
|
return;
|
|
74
73
|
}
|
|
75
|
-
|
|
76
|
-
let { stdout } = await this.validateAgent(validateCmd);
|
|
74
|
+
ui.status('Validating the AppMap agent...');
|
|
75
|
+
let { stdout } = await this.validateAgent(ui, validateCmd);
|
|
77
76
|
const validationResult = (0, ValidationResult_1.parseValidationResult)(stdout);
|
|
78
77
|
const errors = (validationResult.errors || []).filter((e) => e.level === 'error');
|
|
79
78
|
if (errors.length > 0) {
|
|
@@ -83,7 +82,7 @@ class AgentProcedure {
|
|
|
83
82
|
// If appmap-agent-validate returned a schema, and we're using an
|
|
84
83
|
// existing appmap.yml, verify that the config matches the schema.
|
|
85
84
|
if (schema && checkSyntax) {
|
|
86
|
-
|
|
85
|
+
ui.status(`Checking the syntax of AppMap agent configuration...`);
|
|
87
86
|
const config = this.loadConfig();
|
|
88
87
|
const result = (0, validator_1.validateConfig)(schema, config);
|
|
89
88
|
if (!result.valid) {
|
|
@@ -172,7 +171,7 @@ class AgentProcedure {
|
|
|
172
171
|
};
|
|
173
172
|
}
|
|
174
173
|
}
|
|
175
|
-
async commitConfiguration(filesBefore) {
|
|
174
|
+
async commitConfiguration(ui, filesBefore) {
|
|
176
175
|
telemetry_1.default.sendEvent({
|
|
177
176
|
name: `install-agent:commit_config:commit_start`,
|
|
178
177
|
properties: {},
|
|
@@ -205,20 +204,16 @@ class AgentProcedure {
|
|
|
205
204
|
for (const file of filesDiff) {
|
|
206
205
|
filesMessages.push(` ${chalk_1.default.blue(file)}`);
|
|
207
206
|
}
|
|
208
|
-
const
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
]
|
|
219
|
-
.flat()
|
|
220
|
-
.join('\n'),
|
|
221
|
-
});
|
|
207
|
+
const commit = await ui.commitConfiguration([
|
|
208
|
+
`Commit these files to your repo so that everyone on your team can use AppMap`,
|
|
209
|
+
` without them having to repeat the setup process. Bring runtime code analysis`,
|
|
210
|
+
` to your whole team!`,
|
|
211
|
+
filesMessages,
|
|
212
|
+
' ',
|
|
213
|
+
' Commit?',
|
|
214
|
+
]
|
|
215
|
+
.flat()
|
|
216
|
+
.join('\n'));
|
|
222
217
|
if (commit) {
|
|
223
218
|
telemetry_1.default.sendEvent({
|
|
224
219
|
name: `install-agent:commit_config:commit_yes`,
|
|
@@ -230,7 +225,7 @@ class AgentProcedure {
|
|
|
230
225
|
// Gemfile.lock etc. when the installer runs for the first time
|
|
231
226
|
const addGitReturn = await this.gitAdd(filesDiff);
|
|
232
227
|
if (!addGitReturn.success) {
|
|
233
|
-
|
|
228
|
+
ui.error(addGitReturn.errorMessage);
|
|
234
229
|
}
|
|
235
230
|
const commitGitReturn = await this.gitCommit(filesDiff, `Configure AppMap for this project
|
|
236
231
|
|
|
@@ -241,7 +236,7 @@ https://appmap.io/docs/install-appmap-agent.html using the automated
|
|
|
241
236
|
installer tool:
|
|
242
237
|
npx @appland/appmap@latest install`);
|
|
243
238
|
if (!commitGitReturn.success) {
|
|
244
|
-
|
|
239
|
+
ui.error(commitGitReturn.errorMessage);
|
|
245
240
|
}
|
|
246
241
|
telemetry_1.default.sendEvent({
|
|
247
242
|
name: commitGitReturn.success
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"agentProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentProcedure.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,20 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
7
6
|
const agentProcedure_1 = __importDefault(require("./agentProcedure"));
|
|
8
7
|
const ValidationResult_1 = require("./ValidationResult");
|
|
9
8
|
class AgentStatusProcedure extends agentProcedure_1.default {
|
|
10
|
-
async run() {
|
|
9
|
+
async run(ui) {
|
|
11
10
|
console.log('\nAgent environment:');
|
|
12
11
|
const env = await this.getEnvironmentForDisplay();
|
|
13
12
|
console.log(`${env.join('\n')}\n`);
|
|
14
13
|
await this.verifyProject();
|
|
15
|
-
const result = await this.validateProject(true);
|
|
16
|
-
|
|
14
|
+
const result = await this.validateProject(ui, true);
|
|
15
|
+
ui.success('Success!');
|
|
17
16
|
if (result === null || result === void 0 ? void 0 : result.errors)
|
|
18
17
|
for (const warning of result.errors.filter((e) => e.level === 'warning'))
|
|
19
|
-
|
|
18
|
+
ui.warn((0, ValidationResult_1.formatValidationError)(warning));
|
|
20
19
|
}
|
|
21
20
|
}
|
|
22
21
|
exports.default = AgentStatusProcedure;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentStatusProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentStatusProcedure.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"agentStatusProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentStatusProcedure.ts"],"names":[],"mappings":";;;;;AACA,sEAA8C;AAC9C,yDAA2D;AAE3D,MAAqB,oBAAqB,SAAQ,wBAAc;IAC9D,KAAK,CAAC,GAAG,CAAC,EAAe;QACvB,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAEpD,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEvB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM;YAChB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC;gBACtE,EAAE,CAAC,IAAI,CAAC,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,CAAC;CACF;AAfD,uCAeC"}
|
|
@@ -9,7 +9,6 @@ const path_1 = require("path");
|
|
|
9
9
|
const chalk_1 = __importDefault(require("chalk"));
|
|
10
10
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
11
11
|
const utils_1 = require("../../utils");
|
|
12
|
-
const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
13
12
|
const sourceUtil_1 = require("./sourceUtil");
|
|
14
13
|
const errors_1 = require("../errors");
|
|
15
14
|
const javaBuildToolInstaller_1 = __importDefault(require("./javaBuildToolInstaller"));
|
|
@@ -88,7 +87,7 @@ class GradleInstaller extends javaBuildToolInstaller_1.default {
|
|
|
88
87
|
* updated to reference the plugin, offset is the index in the original source
|
|
89
88
|
* from which copying should continue
|
|
90
89
|
*/
|
|
91
|
-
async insertPluginSpec(buildFileSource, parseResult, whitespace) {
|
|
90
|
+
async insertPluginSpec(ui, buildFileSource, parseResult, whitespace) {
|
|
92
91
|
const pluginSpec = this.selectPluginSpec();
|
|
93
92
|
const lines = parseResult.plugins
|
|
94
93
|
? buildFileSource
|
|
@@ -99,14 +98,8 @@ class GradleInstaller extends javaBuildToolInstaller_1.default {
|
|
|
99
98
|
: [];
|
|
100
99
|
const javaPresent = lines.some((line) => line.match(/^\s*id\s+["']\s*java/));
|
|
101
100
|
if (!javaPresent) {
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
name: 'userWillContinue',
|
|
105
|
-
message: `The ${chalk_1.default.red("'java'")} plugin was not found. This configuration is unsupported and is likely to fail. Continue?`,
|
|
106
|
-
default: 'Abort',
|
|
107
|
-
choices: ['Abort', 'Continue'],
|
|
108
|
-
});
|
|
109
|
-
if (userWillContinue === 'Abort') {
|
|
101
|
+
const userWillContinue = await ui.continueWithoutJavaPlugin();
|
|
102
|
+
if (!userWillContinue) {
|
|
110
103
|
throw new errors_1.AbortError('no java plugin found');
|
|
111
104
|
}
|
|
112
105
|
}
|
|
@@ -132,7 +125,6 @@ ${whitespace.padLine(pluginSpec)}
|
|
|
132
125
|
else {
|
|
133
126
|
lines.push(pluginSpec);
|
|
134
127
|
}
|
|
135
|
-
const column = (0, sourceUtil_1.getColumn)(buildFileSource, parseResult.plugins.lbrace);
|
|
136
128
|
const updatedSrc = [
|
|
137
129
|
buildFileSource.substring(0, parseResult.plugins.lbrace + 1),
|
|
138
130
|
lines.map((l) => whitespace.padLine(l)).join(os_1.default.EOL),
|
|
@@ -156,19 +148,14 @@ ${whitespace.padLine(pluginSpec)}
|
|
|
156
148
|
* rbrace of the buildscript block. Also returns the offset into the original
|
|
157
149
|
* source from which copying should continue.
|
|
158
150
|
*/
|
|
159
|
-
async insertRepository(buildFileSource, updatedSrc, offset, parseResult, whitespace) {
|
|
151
|
+
async insertRepository(ui, buildFileSource, updatedSrc, offset, parseResult, whitespace) {
|
|
160
152
|
if (parseResult.mavenPresent) {
|
|
161
153
|
// mavenPresent means there's already a repositories block with
|
|
162
154
|
// mavenCentral in it, so just copy the rest of the original.
|
|
163
155
|
return { updatedSrc, offset };
|
|
164
156
|
}
|
|
165
|
-
const
|
|
166
|
-
|
|
167
|
-
name: 'addMavenCentral',
|
|
168
|
-
message: 'The Maven Central repository is required by the AppMap plugin to fetch the AppMap agent JAR. Add it now?',
|
|
169
|
-
choices: ['Yes', 'No'],
|
|
170
|
-
});
|
|
171
|
-
if (addMavenCentral !== 'Yes') {
|
|
157
|
+
const addMavenCentral = await ui.addMavenCentral();
|
|
158
|
+
if (!addMavenCentral) {
|
|
172
159
|
return { updatedSrc, offset };
|
|
173
160
|
}
|
|
174
161
|
const mavenCentral = `mavenCentral()`;
|
|
@@ -190,18 +177,18 @@ ${whitespace.padLine(mavenCentral)}
|
|
|
190
177
|
return { updatedSrc, offset };
|
|
191
178
|
}
|
|
192
179
|
// TODO: validate the user's project before adding AppMap
|
|
193
|
-
async checkConfigCommand() {
|
|
180
|
+
async checkConfigCommand(_ui) {
|
|
194
181
|
return undefined;
|
|
195
182
|
}
|
|
196
|
-
async installAgent() {
|
|
183
|
+
async installAgent(ui) {
|
|
197
184
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
198
185
|
const buildFileSource = encodedFile.toString();
|
|
199
186
|
const parser = new gradleParser_1.GradleParser();
|
|
200
187
|
const parseResult = parser.parse(buildFileSource);
|
|
201
188
|
parser.checkSyntax(parseResult);
|
|
202
189
|
const whitespace = (0, sourceUtil_1.getWhitespace)(buildFileSource);
|
|
203
|
-
let { updatedSrc, offset } = await this.insertPluginSpec(buildFileSource, parseResult, whitespace);
|
|
204
|
-
({ updatedSrc, offset } = await this.insertRepository(buildFileSource, updatedSrc, offset, parseResult, whitespace));
|
|
190
|
+
let { updatedSrc, offset } = await this.insertPluginSpec(ui, buildFileSource, parseResult, whitespace);
|
|
191
|
+
({ updatedSrc, offset } = await this.insertRepository(ui, buildFileSource, updatedSrc, offset, parseResult, whitespace));
|
|
205
192
|
updatedSrc += buildFileSource.substring(offset);
|
|
206
193
|
encodedFile.write(updatedSrc);
|
|
207
194
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,4CAAoB;AACpB,+BAAiC;AACjC,kDAA0B;AAC1B,oEAA4C;AAC5C,uCAA8C;
|
|
1
|
+
{"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":"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"}
|