@aws-cdk-testing/cli-integ 2.173.4 → 3.0.1
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/.eslintrc.js +9 -0
- package/LICENSE +2 -1
- package/bin/query-github +1 -1
- package/bin/query-github.js +3 -3
- package/bin/query-github.ts +56 -0
- package/bin/run-suite +1 -1
- package/bin/run-suite.js +3 -3
- package/bin/run-suite.ts +140 -0
- package/bin/stage-distribution +1 -1
- package/bin/stage-distribution.js +3 -2
- package/bin/stage-distribution.ts +267 -0
- package/bin/test-root +1 -1
- package/bin/test-root.ts +3 -0
- package/lib/aws.js +9 -6
- package/lib/aws.ts +263 -0
- package/lib/cli/query-github.d.ts +1 -0
- package/lib/cli/query-github.js +54 -0
- package/lib/cli/query-github.ts +56 -0
- package/lib/cli/run-suite.d.ts +1 -0
- package/lib/cli/run-suite.js +131 -0
- package/lib/cli/run-suite.ts +140 -0
- package/lib/cli/stage-distribution.d.ts +1 -0
- package/lib/cli/stage-distribution.js +217 -0
- package/lib/cli/stage-distribution.ts +267 -0
- package/lib/cli/test-root.d.ts +1 -0
- package/lib/cli/test-root.js +6 -0
- package/lib/cli/test-root.ts +3 -0
- package/lib/corking.ts +33 -0
- package/lib/eventually.js +3 -3
- package/lib/eventually.ts +42 -0
- package/lib/files.js +3 -2
- package/lib/files.ts +80 -0
- package/lib/github.js +6 -5
- package/lib/github.ts +43 -0
- package/lib/index.ts +13 -0
- package/lib/integ-test.ts +81 -0
- package/lib/lists.ts +9 -0
- package/lib/memoize.ts +14 -0
- package/lib/npm.ts +41 -0
- package/lib/package-sources/release-source.js +3 -2
- package/lib/package-sources/release-source.ts +81 -0
- package/lib/package-sources/repo-source.ts +111 -0
- package/lib/package-sources/repo-tools/npm.js +5 -4
- package/lib/package-sources/repo-tools/npm.ts +48 -0
- package/lib/package-sources/source.ts +35 -0
- package/lib/package-sources/subprocess.ts +15 -0
- package/lib/resource-pool.js +2 -2
- package/lib/resource-pool.ts +140 -0
- package/lib/resources.ts +4 -0
- package/lib/shell.js +8 -5
- package/lib/shell.ts +168 -0
- package/lib/staging/codeartifact.js +11 -8
- package/lib/staging/codeartifact.ts +387 -0
- package/lib/staging/maven.js +5 -3
- package/lib/staging/maven.ts +95 -0
- package/lib/staging/npm.ts +62 -0
- package/lib/staging/nuget.ts +75 -0
- package/lib/staging/parallel-shell.js +2 -2
- package/lib/staging/parallel-shell.ts +51 -0
- package/lib/staging/pypi.ts +50 -0
- package/lib/staging/usage-dir.ts +99 -0
- package/lib/with-aws.js +3 -2
- package/lib/with-aws.ts +67 -0
- package/lib/with-cdk-app.js +23 -14
- package/lib/with-cdk-app.ts +742 -0
- package/lib/with-cli-lib.ts +134 -0
- package/lib/with-packages.ts +15 -0
- package/lib/with-sam.js +7 -4
- package/lib/with-sam.ts +288 -0
- package/lib/with-temporary-directory.ts +35 -0
- package/lib/with-timeout.ts +33 -0
- package/lib/xpmutex.js +2 -2
- package/lib/xpmutex.ts +218 -0
- package/package.json +86 -62
- package/resources/cloud-assemblies/0.36.0/cdk.out +1 -0
- package/resources/cloud-assemblies/1.10.0-lookup-default-vpc/cdk.out +1 -0
- package/resources/cloud-assemblies/1.10.0-request-azs/cdk.out +1 -0
- package/tests/cli-integ-tests/bootstrapping.integtest.js +22 -13
- package/tests/cli-integ-tests/bootstrapping.integtest.ts +493 -0
- package/tests/cli-integ-tests/cli-lib.integtest.js +3 -2
- package/tests/cli-integ-tests/cli-lib.integtest.ts +90 -0
- package/tests/cli-integ-tests/cli.integtest.js +76 -49
- package/tests/cli-integ-tests/cli.integtest.ts +2874 -0
- package/tests/cli-integ-tests/garbage-collection.integtest.js +2 -2
- package/tests/cli-integ-tests/garbage-collection.integtest.ts +392 -0
- package/tests/init-csharp/init-csharp.integtest.ts +15 -0
- package/tests/init-fsharp/init-fsharp.integtest.ts +15 -0
- package/tests/init-go/init-go.integtest.ts +23 -0
- package/tests/init-java/init-java.integtest.ts +14 -0
- package/tests/init-javascript/init-javascript.integtest.ts +59 -0
- package/tests/init-python/init-python.integtest.ts +20 -0
- package/tests/init-typescript-app/init-typescript-app.integtest.ts +66 -0
- package/tests/init-typescript-lib/init-typescript-lib.integtest.ts +13 -0
- package/tests/tool-integrations/amplify.integtest.ts +43 -0
- package/tests/tool-integrations/with-tool-context.ts +14 -0
- package/tests/uberpackage/uberpackage.integtest.ts +11 -0
- package/resources/cdk-apps/cfn-include-app/.gitignore +0 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a, _b, _c;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
const child_process = require("child_process");
|
|
4
5
|
const fs = require("fs-extra");
|
|
@@ -13,15 +14,15 @@ if (argv[0] === 'install') {
|
|
|
13
14
|
// Replace paths in the 'package.json' in the current directory
|
|
14
15
|
if (fs.pathExistsSync('package.json')) {
|
|
15
16
|
const packageJson = fs.readJsonSync('package.json', { encoding: 'utf-8' });
|
|
16
|
-
for (const deps of [packageJson.dependencies
|
|
17
|
+
for (const deps of [(_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : {}, (_b = packageJson.devDependencies) !== null && _b !== void 0 ? _b : {}]) {
|
|
17
18
|
for (const [name, version] of Object.entries(deps)) {
|
|
18
|
-
deps[name] = repoPackageMap[name]
|
|
19
|
+
deps[name] = (_c = repoPackageMap[name]) !== null && _c !== void 0 ? _c : version;
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
22
|
fs.writeJsonSync('package.json', packageJson, { encoding: 'utf-8' });
|
|
22
23
|
}
|
|
23
24
|
// Replace package names on the command line
|
|
24
|
-
argv = argv.map(x => repoPackageMap[x]
|
|
25
|
+
argv = argv.map(x => { var _a; return (_a = repoPackageMap[x]) !== null && _a !== void 0 ? _a : x; });
|
|
25
26
|
}
|
|
26
27
|
////////////////////////////////////////////////////////////////////////
|
|
27
28
|
// Shell out to original npm
|
|
@@ -39,4 +40,4 @@ child.once('close', code => {
|
|
|
39
40
|
process.exitCode = code;
|
|
40
41
|
}
|
|
41
42
|
});
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibnBtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtDQUErQztBQUMvQywrQkFBK0I7QUFFL0IsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFakMsc0NBQXNDO0FBQ3RDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7QUFFeEIsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssU0FBUyxFQUFFLENBQUM7SUFDMUIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUNsQyxNQUFNLElBQUksS0FBSyxDQUFDLDBCQUEwQixDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUNELE1BQU0sY0FBYyxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRTVGLCtEQUErRDtJQUMvRCxJQUFJLEVBQUUsQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztRQUN0QyxNQUFNLFdBQVcsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQzNFLEtBQUssTUFBTSxJQUFJLElBQUksQ0FBQyxNQUFBLFdBQVcsQ0FBQyxZQUFZLG1DQUFJLEVBQUUsRUFBRSxNQUFBLFdBQVcsQ0FBQyxlQUFlLG1DQUFJLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDdkYsS0FBSyxNQUFNLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztnQkFDbkQsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLE1BQUEsY0FBYyxDQUFDLElBQUksQ0FBQyxtQ0FBSSxPQUFPLENBQUM7WUFDL0MsQ0FBQztRQUNILENBQUM7UUFDRCxFQUFFLENBQUMsYUFBYSxDQUFDLGNBQWMsRUFBRSxXQUFXLEVBQUUsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBRUQsNENBQTRDO0lBQzVDLElBQUksR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLFdBQUMsT0FBQSxNQUFBLGNBQWMsQ0FBQyxDQUFDLENBQUMsbUNBQUksQ0FBQyxDQUFBLEVBQUEsQ0FBQyxDQUFDO0FBQy9DLENBQUM7QUFFRCx3RUFBd0U7QUFDeEUsNkJBQTZCO0FBRTdCLE1BQU0sS0FBSyxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxFQUFFO0lBQzNFLEtBQUssRUFBRSxLQUFLO0lBQ1osS0FBSyxFQUFFLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxTQUFTLENBQUM7Q0FDeEMsQ0FBQyxDQUFDO0FBRUgsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUU7SUFDdEIsc0NBQXNDO0lBQ3RDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakIsT0FBTyxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUM7QUFDdkIsQ0FBQyxDQUFDLENBQUM7QUFFSCxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRTtJQUN6QixJQUFJLElBQUksRUFBRSxDQUFDO1FBQ1QsT0FBTyxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUM7SUFDMUIsQ0FBQztBQUNILENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgY2hpbGRfcHJvY2VzcyBmcm9tICdjaGlsZF9wcm9jZXNzJztcbmltcG9ydCAqIGFzIGZzIGZyb20gJ2ZzLWV4dHJhJztcblxubGV0IGFyZ3YgPSBwcm9jZXNzLmFyZ3Yuc2xpY2UoMik7XG5cbi8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG5jb25zb2xlLmxvZygnZmFrZSBucG0nKTtcblxuaWYgKGFyZ3ZbMF0gPT09ICdpbnN0YWxsJykge1xuICBpZiAoIXByb2Nlc3MuZW52LlJFUE9fUEFDS0FHRV9NQVApIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ1JFUE9fUEFDS0FHRV9NQVAgbm90IHNldCcpO1xuICB9XG4gIGNvbnN0IHJlcG9QYWNrYWdlTWFwID0gZnMucmVhZEpzb25TeW5jKHByb2Nlc3MuZW52LlJFUE9fUEFDS0FHRV9NQVAsIHsgZW5jb2Rpbmc6ICd1dGYtOCcgfSk7XG5cbiAgLy8gUmVwbGFjZSBwYXRocyBpbiB0aGUgJ3BhY2thZ2UuanNvbicgaW4gdGhlIGN1cnJlbnQgZGlyZWN0b3J5XG4gIGlmIChmcy5wYXRoRXhpc3RzU3luYygncGFja2FnZS5qc29uJykpIHtcbiAgICBjb25zdCBwYWNrYWdlSnNvbiA9IGZzLnJlYWRKc29uU3luYygncGFja2FnZS5qc29uJywgeyBlbmNvZGluZzogJ3V0Zi04JyB9KTtcbiAgICBmb3IgKGNvbnN0IGRlcHMgb2YgW3BhY2thZ2VKc29uLmRlcGVuZGVuY2llcyA/PyB7fSwgcGFja2FnZUpzb24uZGV2RGVwZW5kZW5jaWVzID8/IHt9XSkge1xuICAgICAgZm9yIChjb25zdCBbbmFtZSwgdmVyc2lvbl0gb2YgT2JqZWN0LmVudHJpZXMoZGVwcykpIHtcbiAgICAgICAgZGVwc1tuYW1lXSA9IHJlcG9QYWNrYWdlTWFwW25hbWVdID8/IHZlcnNpb247XG4gICAgICB9XG4gICAgfVxuICAgIGZzLndyaXRlSnNvblN5bmMoJ3BhY2thZ2UuanNvbicsIHBhY2thZ2VKc29uLCB7IGVuY29kaW5nOiAndXRmLTgnIH0pO1xuICB9XG5cbiAgLy8gUmVwbGFjZSBwYWNrYWdlIG5hbWVzIG9uIHRoZSBjb21tYW5kIGxpbmVcbiAgYXJndiA9IGFyZ3YubWFwKHggPT4gcmVwb1BhY2thZ2VNYXBbeF0gPz8geCk7XG59XG5cbi8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vL1xuLy8gIFNoZWxsIG91dCB0byBvcmlnaW5hbCBucG1cblxuY29uc3QgY2hpbGQgPSBjaGlsZF9wcm9jZXNzLnNwYXduKCdub2RlJywgW3JlcXVpcmUucmVzb2x2ZSgnbnBtJyksIC4uLmFyZ3ZdLCB7XG4gIHNoZWxsOiBmYWxzZSxcbiAgc3RkaW86IFsnaWdub3JlJywgJ2luaGVyaXQnLCAnaW5oZXJpdCddLFxufSk7XG5cbmNoaWxkLm9uY2UoJ2Vycm9yJywgZSA9PiB7XG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1jb25zb2xlXG4gIGNvbnNvbGUuZXJyb3IoZSk7XG4gIHByb2Nlc3MuZXhpdENvZGUgPSAxO1xufSk7XG5cbmNoaWxkLm9uY2UoJ2Nsb3NlJywgY29kZSA9PiB7XG4gIGlmIChjb2RlKSB7XG4gICAgcHJvY2Vzcy5leGl0Q29kZSA9IGNvZGU7XG4gIH1cbn0pO1xuIl19
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import * as child_process from 'child_process';
|
|
2
|
+
import * as fs from 'fs-extra';
|
|
3
|
+
|
|
4
|
+
let argv = process.argv.slice(2);
|
|
5
|
+
|
|
6
|
+
// eslint-disable-next-line no-console
|
|
7
|
+
console.log('fake npm');
|
|
8
|
+
|
|
9
|
+
if (argv[0] === 'install') {
|
|
10
|
+
if (!process.env.REPO_PACKAGE_MAP) {
|
|
11
|
+
throw new Error('REPO_PACKAGE_MAP not set');
|
|
12
|
+
}
|
|
13
|
+
const repoPackageMap = fs.readJsonSync(process.env.REPO_PACKAGE_MAP, { encoding: 'utf-8' });
|
|
14
|
+
|
|
15
|
+
// Replace paths in the 'package.json' in the current directory
|
|
16
|
+
if (fs.pathExistsSync('package.json')) {
|
|
17
|
+
const packageJson = fs.readJsonSync('package.json', { encoding: 'utf-8' });
|
|
18
|
+
for (const deps of [packageJson.dependencies ?? {}, packageJson.devDependencies ?? {}]) {
|
|
19
|
+
for (const [name, version] of Object.entries(deps)) {
|
|
20
|
+
deps[name] = repoPackageMap[name] ?? version;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
fs.writeJsonSync('package.json', packageJson, { encoding: 'utf-8' });
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
// Replace package names on the command line
|
|
27
|
+
argv = argv.map(x => repoPackageMap[x] ?? x);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
////////////////////////////////////////////////////////////////////////
|
|
31
|
+
// Shell out to original npm
|
|
32
|
+
|
|
33
|
+
const child = child_process.spawn('node', [require.resolve('npm'), ...argv], {
|
|
34
|
+
shell: false,
|
|
35
|
+
stdio: ['ignore', 'inherit', 'inherit'],
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
child.once('error', e => {
|
|
39
|
+
// eslint-disable-next-line no-console
|
|
40
|
+
console.error(e);
|
|
41
|
+
process.exitCode = 1;
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
child.once('close', code => {
|
|
45
|
+
if (code) {
|
|
46
|
+
process.exitCode = code;
|
|
47
|
+
}
|
|
48
|
+
});
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
export interface IPackageSourceSetup {
|
|
2
|
+
readonly name: string;
|
|
3
|
+
readonly description: string;
|
|
4
|
+
|
|
5
|
+
prepare(): Promise<void>;
|
|
6
|
+
cleanup(): Promise<void>;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export interface IPackageSource {
|
|
10
|
+
makeCliAvailable(): Promise<void>;
|
|
11
|
+
|
|
12
|
+
assertJsiiPackagesAvailable(): void;
|
|
13
|
+
majorVersion(): string;
|
|
14
|
+
|
|
15
|
+
initializeDotnetPackages(targetDir: string): Promise<void>;
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* CLI version
|
|
19
|
+
*/
|
|
20
|
+
requestedCliVersion(): string;
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Framework version if it's different than the CLI version
|
|
24
|
+
*
|
|
25
|
+
* Not all tests will respect this.
|
|
26
|
+
*/
|
|
27
|
+
requestedFrameworkVersion(): string;
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Versions of alpha packages if different than the CLI version
|
|
31
|
+
*
|
|
32
|
+
* Not all tests will respect this.
|
|
33
|
+
*/
|
|
34
|
+
requestedAlphaVersion(): string;
|
|
35
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { ReleasePackageSource } from './release-source';
|
|
2
|
+
import { RepoPackageSource } from './repo-source';
|
|
3
|
+
import { IPackageSourceSetup, IPackageSource } from './source';
|
|
4
|
+
|
|
5
|
+
export function serializeForSubprocess(s: IPackageSourceSetup) {
|
|
6
|
+
process.env.PACKAGE_SOURCE = s.name;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export function packageSourceInSubprocess(): IPackageSource {
|
|
10
|
+
switch (process.env.PACKAGE_SOURCE) {
|
|
11
|
+
case 'repo': return new RepoPackageSource();
|
|
12
|
+
case 'release': return new ReleasePackageSource();
|
|
13
|
+
default: throw new Error(`Unrecognized package source: ${process.env.PACKAGE_SOURCE}`);
|
|
14
|
+
}
|
|
15
|
+
}
|
package/lib/resource-pool.js
CHANGED
|
@@ -99,7 +99,7 @@ class ResourcePool {
|
|
|
99
99
|
async returnValue(value) {
|
|
100
100
|
const lock = this.locks[value];
|
|
101
101
|
delete this.locks[value];
|
|
102
|
-
await lock
|
|
102
|
+
await (lock === null || lock === void 0 ? void 0 : lock.release());
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
exports.ResourcePool = ResourcePool;
|
|
@@ -114,4 +114,4 @@ function fisherYatesShuffle(xs) {
|
|
|
114
114
|
xs[i] = h;
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resource-pool.js","sourceRoot":"","sources":["resource-pool.ts"],"names":[],"mappings":"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","sourcesContent":["import { ILock, XpMutex, XpMutexPool } from './xpmutex';\n\n/**\n * A class that holds a pool of resources and gives them out and returns them on-demand\n *\n * The resources will be given out front to back, when they are returned\n * the most recently returned version will be given out again (for best\n * cache coherency).\n *\n * If there are multiple consumers waiting for a resource, consumers are serviced\n * in FIFO order for most fairness.\n */\nexport class ResourcePool<A extends string=string> {\n  public static withResources<A extends string>(name: string, resources: A[]) {\n    const pool = XpMutexPool.fromName(name);\n    return new ResourcePool(pool, resources);\n  }\n\n  private readonly resources: ReadonlyArray<A>;\n  private readonly mutexes: Record<string, XpMutex> = {};\n  private readonly locks: Record<string, ILock | undefined> = {};\n\n  private constructor(private readonly pool: XpMutexPool, resources: A[]) {\n    if (resources.length === 0) {\n      throw new Error('Must have at least one resource in the pool');\n    }\n\n    // Shuffle to reduce contention\n    resources = [...resources];\n    fisherYatesShuffle(resources);\n    this.resources = resources;\n\n    for (const res of resources) {\n      this.mutexes[res] = this.pool.mutex(res);\n    }\n  }\n\n  /**\n   * Take one value from the resource pool\n   *\n   * If no such value is currently available, wait until it is.\n   */\n  public async take(): Promise<ILease<A>> {\n    while (true) {\n      // Start a wait on the unlock now -- if the unlock signal comes after\n      // we try to acquire but before we start the wait, we might miss it.\n      //\n      // (The timeout is in case the unlock signal doesn't come for whatever reason).\n      const wait = this.pool.awaitUnlock(10_000);\n\n      // Try all mutexes, we might need to reacquire an expired lock\n      for (const res of this.resources) {\n        const lease = await this.tryObtainLease(res);\n        if (lease) {\n          // Ignore the wait (count as handled)\n          wait.then(() => {}, () => {});\n          return lease;\n        }\n      }\n\n      // None available, wait until one gets unlocked then try again\n      await wait;\n    }\n  }\n\n  /**\n   * Execute a block using a single resource from the pool\n   */\n  public async using<B>(block: (x: A) => B | Promise<B>): Promise<B> {\n    const lease = await this.take();\n    try {\n      return await block(lease.value);\n    } finally {\n      await lease.dispose();\n    }\n  }\n\n  private async tryObtainLease(value: A) {\n    const lock = await this.mutexes[value].tryAcquire();\n    if (!lock) {\n      return undefined;\n    }\n\n    this.locks[value] = lock;\n    return this.makeLease(value);\n  }\n\n  private makeLease(value: A): ILease<A> {\n    let disposed = false;\n    return {\n      value,\n      dispose: async () => {\n        if (disposed) {\n          throw new Error('Calling dispose() on an already-disposed lease.');\n        }\n        disposed = true;\n        return this.returnValue(value);\n      },\n    };\n  }\n\n  /**\n   * When a value is returned:\n   *\n   * - If someone's waiting for it, give it to them\n   * - Otherwise put it back into the pool\n   */\n  private async returnValue(value: string) {\n    const lock = this.locks[value];\n    delete this.locks[value];\n    await lock?.release();\n  }\n}\n\n/**\n * A single value taken from the pool\n */\nexport interface ILease<A> {\n  /**\n   * The value obtained by the lease\n   */\n  readonly value: A;\n\n  /**\n   * Return the leased value to the pool\n   */\n  dispose(): Promise<void>;\n}\n\n/**\n * Shuffle an array in-place\n */\nfunction fisherYatesShuffle<A>(xs: A[]) {\n  for (let i = xs.length - 1; i >= 1; i--) {\n    const j = Math.floor(Math.random() * i);\n    const h = xs[j];\n    xs[j] = xs[i];\n    xs[i] = h;\n  }\n}\n"]}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { ILock, XpMutex, XpMutexPool } from './xpmutex';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* A class that holds a pool of resources and gives them out and returns them on-demand
|
|
5
|
+
*
|
|
6
|
+
* The resources will be given out front to back, when they are returned
|
|
7
|
+
* the most recently returned version will be given out again (for best
|
|
8
|
+
* cache coherency).
|
|
9
|
+
*
|
|
10
|
+
* If there are multiple consumers waiting for a resource, consumers are serviced
|
|
11
|
+
* in FIFO order for most fairness.
|
|
12
|
+
*/
|
|
13
|
+
export class ResourcePool<A extends string=string> {
|
|
14
|
+
public static withResources<A extends string>(name: string, resources: A[]) {
|
|
15
|
+
const pool = XpMutexPool.fromName(name);
|
|
16
|
+
return new ResourcePool(pool, resources);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
private readonly resources: ReadonlyArray<A>;
|
|
20
|
+
private readonly mutexes: Record<string, XpMutex> = {};
|
|
21
|
+
private readonly locks: Record<string, ILock | undefined> = {};
|
|
22
|
+
|
|
23
|
+
private constructor(private readonly pool: XpMutexPool, resources: A[]) {
|
|
24
|
+
if (resources.length === 0) {
|
|
25
|
+
throw new Error('Must have at least one resource in the pool');
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
// Shuffle to reduce contention
|
|
29
|
+
resources = [...resources];
|
|
30
|
+
fisherYatesShuffle(resources);
|
|
31
|
+
this.resources = resources;
|
|
32
|
+
|
|
33
|
+
for (const res of resources) {
|
|
34
|
+
this.mutexes[res] = this.pool.mutex(res);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Take one value from the resource pool
|
|
40
|
+
*
|
|
41
|
+
* If no such value is currently available, wait until it is.
|
|
42
|
+
*/
|
|
43
|
+
public async take(): Promise<ILease<A>> {
|
|
44
|
+
while (true) {
|
|
45
|
+
// Start a wait on the unlock now -- if the unlock signal comes after
|
|
46
|
+
// we try to acquire but before we start the wait, we might miss it.
|
|
47
|
+
//
|
|
48
|
+
// (The timeout is in case the unlock signal doesn't come for whatever reason).
|
|
49
|
+
const wait = this.pool.awaitUnlock(10_000);
|
|
50
|
+
|
|
51
|
+
// Try all mutexes, we might need to reacquire an expired lock
|
|
52
|
+
for (const res of this.resources) {
|
|
53
|
+
const lease = await this.tryObtainLease(res);
|
|
54
|
+
if (lease) {
|
|
55
|
+
// Ignore the wait (count as handled)
|
|
56
|
+
wait.then(() => {}, () => {});
|
|
57
|
+
return lease;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// None available, wait until one gets unlocked then try again
|
|
62
|
+
await wait;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Execute a block using a single resource from the pool
|
|
68
|
+
*/
|
|
69
|
+
public async using<B>(block: (x: A) => B | Promise<B>): Promise<B> {
|
|
70
|
+
const lease = await this.take();
|
|
71
|
+
try {
|
|
72
|
+
return await block(lease.value);
|
|
73
|
+
} finally {
|
|
74
|
+
await lease.dispose();
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
private async tryObtainLease(value: A) {
|
|
79
|
+
const lock = await this.mutexes[value].tryAcquire();
|
|
80
|
+
if (!lock) {
|
|
81
|
+
return undefined;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
this.locks[value] = lock;
|
|
85
|
+
return this.makeLease(value);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
private makeLease(value: A): ILease<A> {
|
|
89
|
+
let disposed = false;
|
|
90
|
+
return {
|
|
91
|
+
value,
|
|
92
|
+
dispose: async () => {
|
|
93
|
+
if (disposed) {
|
|
94
|
+
throw new Error('Calling dispose() on an already-disposed lease.');
|
|
95
|
+
}
|
|
96
|
+
disposed = true;
|
|
97
|
+
return this.returnValue(value);
|
|
98
|
+
},
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/**
|
|
103
|
+
* When a value is returned:
|
|
104
|
+
*
|
|
105
|
+
* - If someone's waiting for it, give it to them
|
|
106
|
+
* - Otherwise put it back into the pool
|
|
107
|
+
*/
|
|
108
|
+
private async returnValue(value: string) {
|
|
109
|
+
const lock = this.locks[value];
|
|
110
|
+
delete this.locks[value];
|
|
111
|
+
await lock?.release();
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
/**
|
|
116
|
+
* A single value taken from the pool
|
|
117
|
+
*/
|
|
118
|
+
export interface ILease<A> {
|
|
119
|
+
/**
|
|
120
|
+
* The value obtained by the lease
|
|
121
|
+
*/
|
|
122
|
+
readonly value: A;
|
|
123
|
+
|
|
124
|
+
/**
|
|
125
|
+
* Return the leased value to the pool
|
|
126
|
+
*/
|
|
127
|
+
dispose(): Promise<void>;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* Shuffle an array in-place
|
|
132
|
+
*/
|
|
133
|
+
function fisherYatesShuffle<A>(xs: A[]) {
|
|
134
|
+
for (let i = xs.length - 1; i >= 1; i--) {
|
|
135
|
+
const j = Math.floor(Math.random() * i);
|
|
136
|
+
const h = xs[j];
|
|
137
|
+
xs[j] = xs[i];
|
|
138
|
+
xs[i] = h;
|
|
139
|
+
}
|
|
140
|
+
}
|
package/lib/resources.ts
ADDED
package/lib/shell.js
CHANGED
|
@@ -13,6 +13,7 @@ const path = require("path");
|
|
|
13
13
|
* Is platform-aware, handles errors nicely.
|
|
14
14
|
*/
|
|
15
15
|
async function shell(command, options = {}) {
|
|
16
|
+
var _a, _b;
|
|
16
17
|
if (options.modEnv && options.env) {
|
|
17
18
|
throw new Error('Use either env or modEnv but not both');
|
|
18
19
|
}
|
|
@@ -24,11 +25,11 @@ async function shell(command, options = {}) {
|
|
|
24
25
|
};
|
|
25
26
|
// Always output the command
|
|
26
27
|
writeToOutputs(`💻 ${command.join(' ')}\n`);
|
|
27
|
-
const show = options.show
|
|
28
|
+
const show = (_a = options.show) !== null && _a !== void 0 ? _a : 'always';
|
|
28
29
|
if (process.env.VERBOSE) {
|
|
29
30
|
outputs.add(process.stdout);
|
|
30
31
|
}
|
|
31
|
-
const env = options.env
|
|
32
|
+
const env = (_b = options.env) !== null && _b !== void 0 ? _b : (options.modEnv ? { ...process.env, ...options.modEnv } : process.env);
|
|
32
33
|
const child = child_process.spawn(command[0], command.slice(1), {
|
|
33
34
|
...options,
|
|
34
35
|
env,
|
|
@@ -46,10 +47,11 @@ async function shell(command, options = {}) {
|
|
|
46
47
|
stdout.push(chunk);
|
|
47
48
|
});
|
|
48
49
|
child.stderr.on('data', chunk => {
|
|
50
|
+
var _a;
|
|
49
51
|
if (show === 'always') {
|
|
50
52
|
writeToOutputs(chunk);
|
|
51
53
|
}
|
|
52
|
-
if (options.captureStderr
|
|
54
|
+
if ((_a = options.captureStderr) !== null && _a !== void 0 ? _a : true) {
|
|
53
55
|
stderr.push(chunk);
|
|
54
56
|
}
|
|
55
57
|
});
|
|
@@ -111,10 +113,11 @@ function rimraf(fsPath) {
|
|
|
111
113
|
}
|
|
112
114
|
}
|
|
113
115
|
function addToShellPath(x) {
|
|
114
|
-
|
|
116
|
+
var _a, _b;
|
|
117
|
+
const parts = (_b = (_a = process.env.PATH) === null || _a === void 0 ? void 0 : _a.split(':')) !== null && _b !== void 0 ? _b : [];
|
|
115
118
|
if (!parts.includes(x)) {
|
|
116
119
|
parts.unshift(x);
|
|
117
120
|
}
|
|
118
121
|
process.env.PATH = parts.join(':');
|
|
119
122
|
}
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shell.js","sourceRoot":"","sources":["shell.ts"],"names":[],"mappings":"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","sourcesContent":["import * as child_process from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { TestContext } from './integ-test';\nimport { TemporaryDirectoryContext } from './with-temporary-directory';\n\n/**\n * A shell command that does what you want\n *\n * Is platform-aware, handles errors nicely.\n */\nexport async function shell(command: string[], options: ShellOptions = {}): Promise<string> {\n  if (options.modEnv && options.env) {\n    throw new Error('Use either env or modEnv but not both');\n  }\n\n  const outputs = new Set(options.outputs);\n  const writeToOutputs = (x: string) => {\n    for (const outputStream of outputs) {\n      outputStream.write(x);\n    }\n  };\n\n  // Always output the command\n  writeToOutputs(`💻 ${command.join(' ')}\\n`);\n  const show = options.show ?? 'always';\n\n  if (process.env.VERBOSE) {\n    outputs.add(process.stdout);\n  }\n\n  const env = options.env ?? (options.modEnv ? { ...process.env, ...options.modEnv } : process.env);\n\n  const child = child_process.spawn(command[0], command.slice(1), {\n    ...options,\n    env,\n    // Need this for Windows where we want .cmd and .bat to be found as well.\n    shell: true,\n    stdio: ['ignore', 'pipe', 'pipe'],\n  });\n\n  return new Promise<string>((resolve, reject) => {\n    const stdout = new Array<Buffer>();\n    const stderr = new Array<Buffer>();\n\n    child.stdout!.on('data', chunk => {\n      if (show === 'always') {\n        writeToOutputs(chunk);\n      }\n      stdout.push(chunk);\n    });\n\n    child.stderr!.on('data', chunk => {\n      if (show === 'always') {\n        writeToOutputs(chunk);\n      }\n      if (options.captureStderr ?? true) {\n        stderr.push(chunk);\n      }\n    });\n\n    child.once('error', reject);\n\n    child.once('close', code => {\n      const stderrOutput = Buffer.concat(stderr).toString('utf-8');\n      const stdoutOutput = Buffer.concat(stdout).toString('utf-8');\n      const out = (options.onlyStderr ? stderrOutput : stdoutOutput + stderrOutput).trim();\n      if (code === 0 || options.allowErrExit) {\n        resolve(out);\n      } else {\n        if (show === 'error') {\n          writeToOutputs(`${out}\\n`);\n        }\n        reject(new Error(`'${command.join(' ')}' exited with error code ${code}.`));\n      }\n    });\n  });\n}\n\nexport interface ShellOptions extends child_process.SpawnOptions {\n  /**\n   * Properties to add to 'env'\n   */\n  readonly modEnv?: Record<string, string>;\n\n  /**\n   * Don't fail when exiting with an error\n   *\n   * @default false\n   */\n  readonly allowErrExit?: boolean;\n\n  /**\n   * Whether to capture stderr\n   *\n   * @default true\n   */\n  readonly captureStderr?: boolean;\n\n  /**\n   * Pass output here\n   */\n  readonly outputs?: NodeJS.WritableStream[];\n\n  /**\n   * Only return stderr. For example, this is used to validate\n   * that when CI=true, all logs are sent to stdout.\n   *\n   * @default false\n   */\n  readonly onlyStderr?: boolean;\n\n  /**\n   * Don't log to stdout\n   *\n   * @default always\n   */\n  readonly show?: 'always' | 'never' | 'error';\n}\n\nexport class ShellHelper {\n  public static fromContext(context: TestContext & TemporaryDirectoryContext) {\n    return new ShellHelper(context.integTestDir, context.output);\n  }\n\n  constructor(\n    private readonly _cwd: string,\n    private readonly _output: NodeJS.WritableStream) { }\n\n  public async shell(command: string[], options: Omit<ShellOptions, 'cwd' | 'outputs'> = {}): Promise<string> {\n    return shell(command, {\n      outputs: [this._output],\n      cwd: this._cwd,\n      ...options,\n    });\n  }\n}\n\n/**\n * rm -rf reimplementation, don't want to depend on an NPM package for this\n */\nexport function rimraf(fsPath: string) {\n  try {\n    const isDir = fs.lstatSync(fsPath).isDirectory();\n\n    if (isDir) {\n      for (const file of fs.readdirSync(fsPath)) {\n        rimraf(path.join(fsPath, file));\n      }\n      fs.rmdirSync(fsPath);\n    } else {\n      fs.unlinkSync(fsPath);\n    }\n  } catch (e: any) {\n    // We will survive ENOENT\n    if (e.code !== 'ENOENT') { throw e; }\n  }\n}\n\nexport function addToShellPath(x: string) {\n  const parts = process.env.PATH?.split(':') ?? [];\n\n  if (!parts.includes(x)) {\n    parts.unshift(x);\n  }\n\n  process.env.PATH = parts.join(':');\n}\n"]}
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shell.js","sourceRoot":"","sources":["shell.ts"],"names":[],"mappings":"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","sourcesContent":["import * as child_process from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { TestContext } from './integ-test';\nimport { TemporaryDirectoryContext } from './with-temporary-directory';\n\n/**\n * A shell command that does what you want\n *\n * Is platform-aware, handles errors nicely.\n */\nexport async function shell(command: string[], options: ShellOptions = {}): Promise<string> {\n  if (options.modEnv && options.env) {\n    throw new Error('Use either env or modEnv but not both');\n  }\n\n  const outputs = new Set(options.outputs);\n  const writeToOutputs = (x: string) => {\n    for (const outputStream of outputs) {\n      outputStream.write(x);\n    }\n  };\n\n  // Always output the command\n  writeToOutputs(`💻 ${command.join(' ')}\\n`);\n  const show = options.show ?? 'always';\n\n  if (process.env.VERBOSE) {\n    outputs.add(process.stdout);\n  }\n\n  const env = options.env ?? (options.modEnv ? { ...process.env, ...options.modEnv } : process.env);\n\n  const child = child_process.spawn(command[0], command.slice(1), {\n    ...options,\n    env,\n    // Need this for Windows where we want .cmd and .bat to be found as well.\n    shell: true,\n    stdio: ['ignore', 'pipe', 'pipe'],\n  });\n\n  return new Promise<string>((resolve, reject) => {\n    const stdout = new Array<Buffer>();\n    const stderr = new Array<Buffer>();\n\n    child.stdout!.on('data', chunk => {\n      if (show === 'always') {\n        writeToOutputs(chunk);\n      }\n      stdout.push(chunk);\n    });\n\n    child.stderr!.on('data', chunk => {\n      if (show === 'always') {\n        writeToOutputs(chunk);\n      }\n      if (options.captureStderr ?? true) {\n        stderr.push(chunk);\n      }\n    });\n\n    child.once('error', reject);\n\n    child.once('close', code => {\n      const stderrOutput = Buffer.concat(stderr).toString('utf-8');\n      const stdoutOutput = Buffer.concat(stdout).toString('utf-8');\n      const out = (options.onlyStderr ? stderrOutput : stdoutOutput + stderrOutput).trim();\n      if (code === 0 || options.allowErrExit) {\n        resolve(out);\n      } else {\n        if (show === 'error') {\n          writeToOutputs(`${out}\\n`);\n        }\n        reject(new Error(`'${command.join(' ')}' exited with error code ${code}.`));\n      }\n    });\n  });\n}\n\nexport interface ShellOptions extends child_process.SpawnOptions {\n  /**\n   * Properties to add to 'env'\n   */\n  readonly modEnv?: Record<string, string>;\n\n  /**\n   * Don't fail when exiting with an error\n   *\n   * @default false\n   */\n  readonly allowErrExit?: boolean;\n\n  /**\n   * Whether to capture stderr\n   *\n   * @default true\n   */\n  readonly captureStderr?: boolean;\n\n  /**\n   * Pass output here\n   */\n  readonly outputs?: NodeJS.WritableStream[];\n\n  /**\n   * Only return stderr. For example, this is used to validate\n   * that when CI=true, all logs are sent to stdout.\n   *\n   * @default false\n   */\n  readonly onlyStderr?: boolean;\n\n  /**\n   * Don't log to stdout\n   *\n   * @default always\n   */\n  readonly show?: 'always' | 'never' | 'error';\n}\n\nexport class ShellHelper {\n  public static fromContext(context: TestContext & TemporaryDirectoryContext) {\n    return new ShellHelper(context.integTestDir, context.output);\n  }\n\n  constructor(\n    private readonly _cwd: string,\n    private readonly _output: NodeJS.WritableStream) { }\n\n  public async shell(command: string[], options: Omit<ShellOptions, 'cwd' | 'outputs'> = {}): Promise<string> {\n    return shell(command, {\n      outputs: [this._output],\n      cwd: this._cwd,\n      ...options,\n    });\n  }\n}\n\n/**\n * rm -rf reimplementation, don't want to depend on an NPM package for this\n */\nexport function rimraf(fsPath: string) {\n  try {\n    const isDir = fs.lstatSync(fsPath).isDirectory();\n\n    if (isDir) {\n      for (const file of fs.readdirSync(fsPath)) {\n        rimraf(path.join(fsPath, file));\n      }\n      fs.rmdirSync(fsPath);\n    } else {\n      fs.unlinkSync(fsPath);\n    }\n  } catch (e: any) {\n    // We will survive ENOENT\n    if (e.code !== 'ENOENT') { throw e; }\n  }\n}\n\nexport function addToShellPath(x: string) {\n  const parts = process.env.PATH?.split(':') ?? [];\n\n  if (!parts.includes(x)) {\n    parts.unshift(x);\n  }\n\n  process.env.PATH = parts.join(':');\n}\n"]}
|
package/lib/shell.ts
ADDED
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
import * as child_process from 'child_process';
|
|
2
|
+
import * as fs from 'fs';
|
|
3
|
+
import * as path from 'path';
|
|
4
|
+
import { TestContext } from './integ-test';
|
|
5
|
+
import { TemporaryDirectoryContext } from './with-temporary-directory';
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* A shell command that does what you want
|
|
9
|
+
*
|
|
10
|
+
* Is platform-aware, handles errors nicely.
|
|
11
|
+
*/
|
|
12
|
+
export async function shell(command: string[], options: ShellOptions = {}): Promise<string> {
|
|
13
|
+
if (options.modEnv && options.env) {
|
|
14
|
+
throw new Error('Use either env or modEnv but not both');
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
const outputs = new Set(options.outputs);
|
|
18
|
+
const writeToOutputs = (x: string) => {
|
|
19
|
+
for (const outputStream of outputs) {
|
|
20
|
+
outputStream.write(x);
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
// Always output the command
|
|
25
|
+
writeToOutputs(`💻 ${command.join(' ')}\n`);
|
|
26
|
+
const show = options.show ?? 'always';
|
|
27
|
+
|
|
28
|
+
if (process.env.VERBOSE) {
|
|
29
|
+
outputs.add(process.stdout);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const env = options.env ?? (options.modEnv ? { ...process.env, ...options.modEnv } : process.env);
|
|
33
|
+
|
|
34
|
+
const child = child_process.spawn(command[0], command.slice(1), {
|
|
35
|
+
...options,
|
|
36
|
+
env,
|
|
37
|
+
// Need this for Windows where we want .cmd and .bat to be found as well.
|
|
38
|
+
shell: true,
|
|
39
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
return new Promise<string>((resolve, reject) => {
|
|
43
|
+
const stdout = new Array<Buffer>();
|
|
44
|
+
const stderr = new Array<Buffer>();
|
|
45
|
+
|
|
46
|
+
child.stdout!.on('data', chunk => {
|
|
47
|
+
if (show === 'always') {
|
|
48
|
+
writeToOutputs(chunk);
|
|
49
|
+
}
|
|
50
|
+
stdout.push(chunk);
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
child.stderr!.on('data', chunk => {
|
|
54
|
+
if (show === 'always') {
|
|
55
|
+
writeToOutputs(chunk);
|
|
56
|
+
}
|
|
57
|
+
if (options.captureStderr ?? true) {
|
|
58
|
+
stderr.push(chunk);
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
child.once('error', reject);
|
|
63
|
+
|
|
64
|
+
child.once('close', code => {
|
|
65
|
+
const stderrOutput = Buffer.concat(stderr).toString('utf-8');
|
|
66
|
+
const stdoutOutput = Buffer.concat(stdout).toString('utf-8');
|
|
67
|
+
const out = (options.onlyStderr ? stderrOutput : stdoutOutput + stderrOutput).trim();
|
|
68
|
+
if (code === 0 || options.allowErrExit) {
|
|
69
|
+
resolve(out);
|
|
70
|
+
} else {
|
|
71
|
+
if (show === 'error') {
|
|
72
|
+
writeToOutputs(`${out}\n`);
|
|
73
|
+
}
|
|
74
|
+
reject(new Error(`'${command.join(' ')}' exited with error code ${code}.`));
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
export interface ShellOptions extends child_process.SpawnOptions {
|
|
81
|
+
/**
|
|
82
|
+
* Properties to add to 'env'
|
|
83
|
+
*/
|
|
84
|
+
readonly modEnv?: Record<string, string>;
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* Don't fail when exiting with an error
|
|
88
|
+
*
|
|
89
|
+
* @default false
|
|
90
|
+
*/
|
|
91
|
+
readonly allowErrExit?: boolean;
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* Whether to capture stderr
|
|
95
|
+
*
|
|
96
|
+
* @default true
|
|
97
|
+
*/
|
|
98
|
+
readonly captureStderr?: boolean;
|
|
99
|
+
|
|
100
|
+
/**
|
|
101
|
+
* Pass output here
|
|
102
|
+
*/
|
|
103
|
+
readonly outputs?: NodeJS.WritableStream[];
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* Only return stderr. For example, this is used to validate
|
|
107
|
+
* that when CI=true, all logs are sent to stdout.
|
|
108
|
+
*
|
|
109
|
+
* @default false
|
|
110
|
+
*/
|
|
111
|
+
readonly onlyStderr?: boolean;
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* Don't log to stdout
|
|
115
|
+
*
|
|
116
|
+
* @default always
|
|
117
|
+
*/
|
|
118
|
+
readonly show?: 'always' | 'never' | 'error';
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
export class ShellHelper {
|
|
122
|
+
public static fromContext(context: TestContext & TemporaryDirectoryContext) {
|
|
123
|
+
return new ShellHelper(context.integTestDir, context.output);
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
constructor(
|
|
127
|
+
private readonly _cwd: string,
|
|
128
|
+
private readonly _output: NodeJS.WritableStream) { }
|
|
129
|
+
|
|
130
|
+
public async shell(command: string[], options: Omit<ShellOptions, 'cwd' | 'outputs'> = {}): Promise<string> {
|
|
131
|
+
return shell(command, {
|
|
132
|
+
outputs: [this._output],
|
|
133
|
+
cwd: this._cwd,
|
|
134
|
+
...options,
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
/**
|
|
140
|
+
* rm -rf reimplementation, don't want to depend on an NPM package for this
|
|
141
|
+
*/
|
|
142
|
+
export function rimraf(fsPath: string) {
|
|
143
|
+
try {
|
|
144
|
+
const isDir = fs.lstatSync(fsPath).isDirectory();
|
|
145
|
+
|
|
146
|
+
if (isDir) {
|
|
147
|
+
for (const file of fs.readdirSync(fsPath)) {
|
|
148
|
+
rimraf(path.join(fsPath, file));
|
|
149
|
+
}
|
|
150
|
+
fs.rmdirSync(fsPath);
|
|
151
|
+
} else {
|
|
152
|
+
fs.unlinkSync(fsPath);
|
|
153
|
+
}
|
|
154
|
+
} catch (e: any) {
|
|
155
|
+
// We will survive ENOENT
|
|
156
|
+
if (e.code !== 'ENOENT') { throw e; }
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
export function addToShellPath(x: string) {
|
|
161
|
+
const parts = process.env.PATH?.split(':') ?? [];
|
|
162
|
+
|
|
163
|
+
if (!parts.includes(x)) {
|
|
164
|
+
parts.unshift(x);
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
process.env.PATH = parts.join(':');
|
|
168
|
+
}
|