@aws-cdk-testing/cli-integ 3.1.0 → 3.1.2
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/NOTICE +1 -1
- package/lib/aws.d.ts +8 -2
- package/lib/aws.js +22 -8
- package/lib/aws.ts +28 -10
- package/lib/cli/run-suite.js +2 -1
- package/lib/cli/run-suite.ts +1 -1
- package/lib/cli/stage-distribution.js +1 -1
- package/lib/cli/stage-distribution.ts +0 -5
- package/lib/github.js +1 -2
- package/lib/github.ts +1 -1
- package/lib/integ-test.d.ts +1 -0
- package/lib/integ-test.js +3 -2
- package/lib/integ-test.ts +4 -1
- package/lib/package-sources/release-source.js +1 -1
- package/lib/package-sources/release-source.ts +2 -1
- package/lib/package-sources/repo-source.d.ts +4 -4
- package/lib/package-sources/repo-source.js +5 -5
- package/lib/package-sources/repo-source.ts +6 -5
- package/lib/proxy.d.ts +13 -0
- package/lib/proxy.js +49 -0
- package/lib/proxy.ts +64 -0
- package/lib/with-aws.d.ts +3 -0
- package/lib/with-aws.js +54 -6
- package/lib/with-aws.ts +52 -5
- package/lib/with-cdk-app.d.ts +21 -2
- package/lib/with-cdk-app.js +73 -73
- package/lib/with-cdk-app.ts +96 -95
- package/lib/with-cli-lib.d.ts +2 -2
- package/lib/with-cli-lib.js +12 -2
- package/lib/with-cli-lib.ts +18 -4
- package/lib/with-sam.js +2 -1
- package/lib/with-sam.ts +1 -0
- package/package.json +6 -5
- package/resources/cdk-apps/sam_cdk_integ_app/src/docker/DockerImageFunctionConstruct/Dockerfile +2 -0
- package/resources/integ.jest.config.js +4 -1
- package/tests/cli-integ-tests/bootstrapping.integtest.js +20 -1
- package/tests/cli-integ-tests/bootstrapping.integtest.ts +25 -1
- package/tests/cli-integ-tests/cli.integtest.js +70 -38
- package/tests/cli-integ-tests/cli.integtest.ts +79 -51
- package/tests/cli-integ-tests/proxy.integtest.d.ts +1 -0
- package/tests/cli-integ-tests/proxy.integtest.js +147 -0
- package/tests/cli-integ-tests/proxy.integtest.ts +167 -0
- package/tests/init-javascript/init-javascript.integtest.js +1 -1
- package/tests/init-javascript/init-javascript.integtest.ts +0 -1
- package/tests/init-typescript-app/init-typescript-app.integtest.js +2 -2
- package/tests/init-typescript-app/init-typescript-app.integtest.ts +1 -1
- package/tests/uberpackage/uberpackage.integtest.js +2 -2
- package/tests/uberpackage/uberpackage.integtest.ts +2 -2
package/lib/integ-test.ts
CHANGED
|
@@ -19,9 +19,10 @@ let failed = false;
|
|
|
19
19
|
|
|
20
20
|
export interface TestContext {
|
|
21
21
|
readonly randomString: string;
|
|
22
|
+
readonly name: string;
|
|
22
23
|
readonly output: NodeJS.WritableStream;
|
|
23
24
|
log(s: string): void;
|
|
24
|
-
}
|
|
25
|
+
}
|
|
25
26
|
|
|
26
27
|
if (process.env.JEST_TEST_CONCURRENT === 'true') {
|
|
27
28
|
process.stderr.write('ℹ️ JEST_TEST_CONCURRENT is true: tests will run concurrently and filters have no effect!\n0');
|
|
@@ -61,6 +62,7 @@ export function integTest(
|
|
|
61
62
|
return await callback({
|
|
62
63
|
output,
|
|
63
64
|
randomString: randomString(),
|
|
65
|
+
name,
|
|
64
66
|
log(s: string) {
|
|
65
67
|
output.write(`${s}\n`);
|
|
66
68
|
},
|
|
@@ -98,6 +100,7 @@ export function integTest(
|
|
|
98
100
|
} else {
|
|
99
101
|
// Use 'console.log' so the output is buffered by
|
|
100
102
|
// jest and prints without a stack trace (if verbose: false).
|
|
103
|
+
// eslint-disable-next-line no-console
|
|
101
104
|
console.log(output.buffer().toString());
|
|
102
105
|
}
|
|
103
106
|
throw e;
|
|
@@ -68,4 +68,4 @@ class ReleasePackageSource {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
exports.ReleasePackageSource = ReleasePackageSource;
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsZWFzZS1zb3VyY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJyZWxlYXNlLXNvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5QkFBeUI7QUFDekIsNkJBQTZCO0FBQzdCLCtCQUErQjtBQUUvQixvQ0FBaUQ7QUFDakQsb0NBQXlEO0FBRXpELE1BQWEseUJBQXlCO0lBTXBDLFlBQTZCLE9BQWUsRUFBbUIsZ0JBQXlCO1FBQTNELFlBQU8sR0FBUCxPQUFPLENBQVE7UUFBbUIscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFTO1FBTC9FLFNBQUksR0FBRyxTQUFTLENBQUM7UUFNeEIsSUFBSSxDQUFDLFdBQVcsR0FBRyxhQUFhLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNqRCxDQUFDO0lBRU0sS0FBSyxDQUFDLE9BQU87O1FBQ2xCLElBQUksQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2hFLEVBQUUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBRWhELE1BQU0sSUFBQSxhQUFLLEVBQUMsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsV0FBVyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsRUFBRTtZQUNsRixHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU87U0FDbEIsQ0FBQyxDQUFDO1FBRUgsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUN4QyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ25DLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEdBQUcsTUFBQSxJQUFJLENBQUMsZ0JBQWdCLG1DQUFJLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEUsQ0FBQztJQUVNLEtBQUssQ0FBQyxPQUFPO1FBQ2xCLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2pCLElBQUEsY0FBTSxFQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN2QixDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBNUJELDhEQTRCQztBQUVELE1BQWEsb0JBQW9CO0lBSS9CO1FBQ0UsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFlBQWEsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBUSxDQUFDO0lBQ3RDLENBQUM7SUFFTSxLQUFLLENBQUMsZ0JBQWdCO1FBQzNCLElBQUEsc0JBQWMsRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUVNLDJCQUEyQjtJQUNsQyxDQUFDO0lBRU0sS0FBSyxDQUFDLHdCQUF3QixDQUFDLFVBQWtCO1FBQ3RELElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQztZQUM5QixNQUFNLElBQUEsNkJBQXFCLEVBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDckUsQ0FBQztJQUNILENBQUM7SUFFTSxZQUFZO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFXLENBQUM7SUFDOUMsQ0FBQztJQUVNLG1CQUFtQjtRQUN4QixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUVNLHlCQUF5QjtRQUM5QixPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWtCLENBQUM7SUFDeEMsQ0FBQztJQUVNLHFCQUFxQjtRQUMxQixNQUFNLGdCQUFnQixHQUFHLElBQUksQ0FBQyx5QkFBeUIsRUFBRSxDQUFDO1FBQzFELElBQUksZ0JBQWdCLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7WUFDdEMseUJBQXlCO1lBQ3pCLE9BQU8sZ0JBQWdCLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUM3RCxDQUFDO2FBQU0sQ0FBQztZQUNOLHVCQUF1QjtZQUN2QixPQUFPLEdBQUcsZ0JBQWdCLFVBQVUsQ0FBQztRQUN2QyxDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBNUNELG9EQTRDQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIG9zIGZyb20gJ29zJztcbmltcG9ydCAqIGFzIHBhdGggZnJvbSAncGF0aCc7XG5pbXBvcnQgKiBhcyBmcyBmcm9tICdmcy1leHRyYSc7XG5pbXBvcnQgeyBJUGFja2FnZVNvdXJjZVNldHVwLCBJUGFja2FnZVNvdXJjZSB9IGZyb20gJy4vc291cmNlJztcbmltcG9ydCB7IGNvcHlEaXJlY3RvcnlDb250ZW50cyB9IGZyb20gJy4uL2ZpbGVzJztcbmltcG9ydCB7IHNoZWxsLCByaW1yYWYsIGFkZFRvU2hlbGxQYXRoIH0gZnJvbSAnLi4vc2hlbGwnO1xuXG5leHBvcnQgY2xhc3MgUmVsZWFzZVBhY2thZ2VTb3VyY2VTZXR1cCBpbXBsZW1lbnRzIElQYWNrYWdlU291cmNlU2V0dXAge1xuICByZWFkb25seSBuYW1lID0gJ3JlbGVhc2UnO1xuICByZWFkb25seSBkZXNjcmlwdGlvbjogc3RyaW5nO1xuXG4gIHByaXZhdGUgdGVtcERpcj86IHN0cmluZztcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlYWRvbmx5IHZlcnNpb246IHN0cmluZywgcHJpdmF0ZSByZWFkb25seSBmcmFtZXdvcmtWZXJzaW9uPzogc3RyaW5nKSB7XG4gICAgdGhpcy5kZXNjcmlwdGlvbiA9IGByZWxlYXNlIEAgJHt0aGlzLnZlcnNpb259YDtcbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBwcmVwYXJlKCk6IFByb21pc2U8dm9pZD4ge1xuICAgIHRoaXMudGVtcERpciA9IGZzLm1rZHRlbXBTeW5jKHBhdGguam9pbihvcy50bXBkaXIoKSwgJ3RtcGNkaycpKTtcbiAgICBmcy5ta2RpclN5bmModGhpcy50ZW1wRGlyLCB7IHJlY3Vyc2l2ZTogdHJ1ZSB9KTtcblxuICAgIGF3YWl0IHNoZWxsKFsnbm9kZScsIHJlcXVpcmUucmVzb2x2ZSgnbnBtJyksICdpbnN0YWxsJywgYGF3cy1jZGtAJHt0aGlzLnZlcnNpb259YF0sIHtcbiAgICAgIGN3ZDogdGhpcy50ZW1wRGlyLFxuICAgIH0pO1xuXG4gICAgcHJvY2Vzcy5lbnYuQ0RLX0NMSV9QQVRIID0gdGhpcy50ZW1wRGlyO1xuICAgIHByb2Nlc3MuZW52LlZFUlNJT04gPSB0aGlzLnZlcnNpb247XG4gICAgcHJvY2Vzcy5lbnYuRlJBTUVXT1JLX1ZFUlNJT04gPSB0aGlzLmZyYW1ld29ya1ZlcnNpb24gPz8gdGhpcy52ZXJzaW9uO1xuICB9XG5cbiAgcHVibGljIGFzeW5jIGNsZWFudXAoKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgaWYgKHRoaXMudGVtcERpcikge1xuICAgICAgcmltcmFmKHRoaXMudGVtcERpcik7XG4gICAgfVxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBSZWxlYXNlUGFja2FnZVNvdXJjZSBpbXBsZW1lbnRzIElQYWNrYWdlU291cmNlIHtcbiAgcHJpdmF0ZSByZWFkb25seSBjbGlQYXRoOiBzdHJpbmc7XG4gIHByaXZhdGUgcmVhZG9ubHkgdmVyc2lvbjogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKCkge1xuICAgIHRoaXMuY2xpUGF0aCA9IHByb2Nlc3MuZW52LkNES19DTElfUEFUSCE7XG4gICAgdGhpcy52ZXJzaW9uID0gcHJvY2Vzcy5lbnYuVkVSU0lPTiE7XG4gIH1cblxuICBwdWJsaWMgYXN5bmMgbWFrZUNsaUF2YWlsYWJsZSgpIHtcbiAgICBhZGRUb1NoZWxsUGF0aChwYXRoLmpvaW4odGhpcy5jbGlQYXRoLCAnbm9kZV9tb2R1bGVzJywgJy5iaW4nKSk7XG4gIH1cblxuICBwdWJsaWMgYXNzZXJ0SnNpaVBhY2thZ2VzQXZhaWxhYmxlKCkge1xuICB9XG5cbiAgcHVibGljIGFzeW5jIGluaXRpYWxpemVEb3RuZXRQYWNrYWdlcyhjdXJyZW50RGlyOiBzdHJpbmcpIHtcbiAgICBpZiAocHJvY2Vzcy5lbnYuQ1dEX0ZJTEVTX0RJUikge1xuICAgICAgYXdhaXQgY29weURpcmVjdG9yeUNvbnRlbnRzKHByb2Nlc3MuZW52LkNXRF9GSUxFU19ESVIsIGN1cnJlbnREaXIpO1xuICAgIH1cbiAgfVxuXG4gIHB1YmxpYyBtYWpvclZlcnNpb24oKSB7XG4gICAgcmV0dXJuIHRoaXMudmVyc2lvbi5zcGxpdCgnLicpWzBdIGFzIHN0cmluZztcbiAgfVxuXG4gIHB1YmxpYyByZXF1ZXN0ZWRDbGlWZXJzaW9uKCkge1xuICAgIHJldHVybiB0aGlzLnZlcnNpb247XG4gIH1cblxuICBwdWJsaWMgcmVxdWVzdGVkRnJhbWV3b3JrVmVyc2lvbigpIHtcbiAgICByZXR1cm4gcHJvY2Vzcy5lbnYuRlJBTUVXT1JLX1ZFUlNJT04hO1xuICB9XG5cbiAgcHVibGljIHJlcXVlc3RlZEFscGhhVmVyc2lvbigpOiBzdHJpbmcge1xuICAgIGNvbnN0IGZyYW1ld29ya1ZlcnNpb24gPSB0aGlzLnJlcXVlc3RlZEZyYW1ld29ya1ZlcnNpb24oKTtcbiAgICBpZiAoZnJhbWV3b3JrVmVyc2lvbi5pbmNsdWRlcygnLXJjLicpKSB7XG4gICAgICAvLyBGb3IgYSBwaXBlbGluZSByZWxlYXNlXG4gICAgICByZXR1cm4gZnJhbWV3b3JrVmVyc2lvbi5yZXBsYWNlKC8tcmNcXC5cXGQrJC8sICctYWxwaGEuOTk5Jyk7XG4gICAgfSBlbHNlIHtcbiAgICAgIC8vIEZvciBhIHN0YWJsZSByZWxlYXNlXG4gICAgICByZXR1cm4gYCR7ZnJhbWV3b3JrVmVyc2lvbn0tYWxwaGEuMGA7XG4gICAgfVxuICB9XG59XG4iXX0=
|
|
@@ -7,11 +7,12 @@ import { shell, rimraf, addToShellPath } from '../shell';
|
|
|
7
7
|
|
|
8
8
|
export class ReleasePackageSourceSetup implements IPackageSourceSetup {
|
|
9
9
|
readonly name = 'release';
|
|
10
|
-
readonly description
|
|
10
|
+
readonly description: string;
|
|
11
11
|
|
|
12
12
|
private tempDir?: string;
|
|
13
13
|
|
|
14
14
|
constructor(private readonly version: string, private readonly frameworkVersion?: string) {
|
|
15
|
+
this.description = `release @ ${this.version}`;
|
|
15
16
|
}
|
|
16
17
|
|
|
17
18
|
public async prepare(): Promise<void> {
|
|
@@ -19,10 +19,10 @@ export declare class RepoPackageSource implements IPackageSource {
|
|
|
19
19
|
requestedAlphaVersion(): string;
|
|
20
20
|
}
|
|
21
21
|
/**
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
* Return a { name -> directory } packages found in a Yarn monorepo
|
|
23
|
+
*
|
|
24
|
+
* Cached in YARN_MONOREPO_CACHE.
|
|
25
|
+
*/
|
|
26
26
|
export declare function findYarnPackages(root: string): Promise<Record<string, string>>;
|
|
27
27
|
/**
|
|
28
28
|
* Find the root directory of the repo from the current directory
|
|
@@ -64,10 +64,10 @@ async function writePackageMap(repoRoot) {
|
|
|
64
64
|
*/
|
|
65
65
|
const YARN_MONOREPO_CACHE = {};
|
|
66
66
|
/**
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
67
|
+
* Return a { name -> directory } packages found in a Yarn monorepo
|
|
68
|
+
*
|
|
69
|
+
* Cached in YARN_MONOREPO_CACHE.
|
|
70
|
+
*/
|
|
71
71
|
async function findYarnPackages(root) {
|
|
72
72
|
if (!(root in YARN_MONOREPO_CACHE)) {
|
|
73
73
|
const outputDataString = JSON.parse(await (0, shell_1.shell)(['yarn', 'workspaces', '--json', 'info'], {
|
|
@@ -94,4 +94,4 @@ async function autoFindRoot() {
|
|
|
94
94
|
}
|
|
95
95
|
return path.dirname(found);
|
|
96
96
|
}
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"repo-source.js","sourceRoot":"","sources":["repo-source.ts"],"names":[],"mappings":"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","sourcesContent":["import * as os from 'os';\nimport * as path from 'path';\nimport * as fs from 'fs-extra';\nimport { IPackageSourceSetup, IPackageSource } from './source';\nimport { findUp } from '../files';\nimport { shell, addToShellPath } from '../shell';\n\nexport class RepoPackageSourceSetup implements IPackageSourceSetup {\n  readonly name = 'repo';\n  readonly description: string;\n\n  constructor(private readonly repoRoot: string) {\n    this.description = `repo(${this.repoRoot})`;\n  }\n\n  public async prepare(): Promise<void> {\n    if (!await fs.pathExists(path.join(this.repoRoot, 'package.json')) || !await fs.pathExists(path.join(this.repoRoot, 'yarn.lock'))) {\n      throw new Error(`${this.repoRoot}: does not look like the repository root`);\n    }\n\n    process.env.REPO_ROOT = this.repoRoot;\n    process.env.REPO_PACKAGE_MAP = await writePackageMap(this.repoRoot);\n    addToShellPath(path.resolve(__dirname, 'repo-tools'));\n  }\n\n  public async cleanup(): Promise<void> {\n  }\n}\n\nexport class RepoPackageSource implements IPackageSource {\n  private readonly repoRoot: string;\n\n  constructor() {\n    this.repoRoot = process.env.REPO_ROOT as string;\n  }\n\n  public async makeCliAvailable() {\n    addToShellPath(path.join(this.repoRoot, 'packages', 'aws-cdk', 'bin'));\n  }\n\n  public assertJsiiPackagesAvailable() {\n    throw new Error('jsii client packages are not available when using REPO source');\n  }\n\n  public async initializeDotnetPackages() {\n  }\n\n  public majorVersion() {\n    const releaseJson = fs.readJsonSync(path.resolve(this.repoRoot, 'release.json'));\n    return releaseJson.majorVersion;\n  }\n\n  public requestedCliVersion(): string {\n    return '*';\n  }\n\n  public requestedFrameworkVersion(): string {\n    return '*';\n  }\n\n  public requestedAlphaVersion(): string {\n    return '*';\n  }\n}\n\nasync function writePackageMap(repoRoot: string): Promise<string> {\n  const packages = await findYarnPackages(repoRoot);\n  const fileName = path.join(os.tmpdir(), 'package-map.json');\n  await fs.writeJson(fileName, packages);\n  return fileName;\n}\n\n/**\n * Cache monorepo discovery results, we only want to do this once per run\n */\nconst YARN_MONOREPO_CACHE: Record<string, any> = {};\n\n/**\n * Return a { name -> directory } packages found in a Yarn monorepo\n *\n * Cached in YARN_MONOREPO_CACHE.\n */\nexport async function findYarnPackages(root: string): Promise<Record<string, string>> {\n  if (!(root in YARN_MONOREPO_CACHE)) {\n    const outputDataString: string = JSON.parse(await shell(['yarn', 'workspaces', '--json', 'info'], {\n      captureStderr: false,\n      cwd: root,\n      show: 'error',\n    })).data;\n    const output: YarnWorkspacesOutput = JSON.parse(outputDataString);\n\n    const ret: Record<string, string> = {};\n    for (const [k, v] of Object.entries(output)) {\n      ret[k] = path.join(root, v.location);\n    }\n    YARN_MONOREPO_CACHE[root] = ret;\n  }\n  return YARN_MONOREPO_CACHE[root];\n}\n\n/**\n * Find the root directory of the repo from the current directory\n */\nexport async function autoFindRoot() {\n  const found = findUp('release.json');\n  if (!found) {\n    throw new Error(`Could not determine repository root: 'release.json' not found from ${process.cwd()}`);\n  }\n  return path.dirname(found);\n}\n\ntype YarnWorkspacesOutput = Record<string, { location: string }>;\n"]}
|
|
@@ -7,9 +7,10 @@ import { shell, addToShellPath } from '../shell';
|
|
|
7
7
|
|
|
8
8
|
export class RepoPackageSourceSetup implements IPackageSourceSetup {
|
|
9
9
|
readonly name = 'repo';
|
|
10
|
-
readonly description
|
|
10
|
+
readonly description: string;
|
|
11
11
|
|
|
12
12
|
constructor(private readonly repoRoot: string) {
|
|
13
|
+
this.description = `repo(${this.repoRoot})`;
|
|
13
14
|
}
|
|
14
15
|
|
|
15
16
|
public async prepare(): Promise<void> {
|
|
@@ -75,10 +76,10 @@ async function writePackageMap(repoRoot: string): Promise<string> {
|
|
|
75
76
|
const YARN_MONOREPO_CACHE: Record<string, any> = {};
|
|
76
77
|
|
|
77
78
|
/**
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
* Return a { name -> directory } packages found in a Yarn monorepo
|
|
80
|
+
*
|
|
81
|
+
* Cached in YARN_MONOREPO_CACHE.
|
|
82
|
+
*/
|
|
82
83
|
export async function findYarnPackages(root: string): Promise<Record<string, string>> {
|
|
83
84
|
if (!(root in YARN_MONOREPO_CACHE)) {
|
|
84
85
|
const outputDataString: string = JSON.parse(await shell(['yarn', 'workspaces', '--json', 'info'], {
|
package/lib/proxy.d.ts
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import * as mockttp from 'mockttp';
|
|
2
|
+
import { CompletedRequest } from 'mockttp';
|
|
3
|
+
export declare function startProxyServer(certDirRoot?: string): Promise<ProxyServer>;
|
|
4
|
+
export interface ProxyServer {
|
|
5
|
+
readonly certPath: string;
|
|
6
|
+
readonly keyPath: string;
|
|
7
|
+
readonly server: mockttp.Mockttp;
|
|
8
|
+
readonly url: string;
|
|
9
|
+
readonly port: number;
|
|
10
|
+
getSeenRequests(): Promise<CompletedRequest[]>;
|
|
11
|
+
stop(): Promise<void>;
|
|
12
|
+
}
|
|
13
|
+
export declare function awsActionsFromRequests(requests: CompletedRequest[]): string[];
|
package/lib/proxy.js
ADDED
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.startProxyServer = startProxyServer;
|
|
4
|
+
exports.awsActionsFromRequests = awsActionsFromRequests;
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
const querystring = require("node:querystring");
|
|
7
|
+
const os = require("os");
|
|
8
|
+
const path = require("path");
|
|
9
|
+
const mockttp = require("mockttp");
|
|
10
|
+
async function startProxyServer(certDirRoot) {
|
|
11
|
+
const certDir = await fs_1.promises.mkdtemp(path.join(certDirRoot !== null && certDirRoot !== void 0 ? certDirRoot : os.tmpdir(), 'cdk-'));
|
|
12
|
+
const certPath = path.join(certDir, 'cert.pem');
|
|
13
|
+
const keyPath = path.join(certDir, 'key.pem');
|
|
14
|
+
// Set up key and certificate
|
|
15
|
+
const { key, cert } = await mockttp.generateCACertificate();
|
|
16
|
+
await fs_1.promises.writeFile(keyPath, key);
|
|
17
|
+
await fs_1.promises.writeFile(certPath, cert);
|
|
18
|
+
const server = mockttp.getLocal({
|
|
19
|
+
https: { keyPath: keyPath, certPath: certPath },
|
|
20
|
+
});
|
|
21
|
+
// We don't need to modify any request, so the proxy
|
|
22
|
+
// passes through all requests to the target host.
|
|
23
|
+
const endpoint = await server
|
|
24
|
+
.forAnyRequest()
|
|
25
|
+
.thenPassThrough();
|
|
26
|
+
const port = 9000 + Math.floor(Math.random() * 10000);
|
|
27
|
+
// server.enableDebug();
|
|
28
|
+
await server.start(port);
|
|
29
|
+
return {
|
|
30
|
+
certPath,
|
|
31
|
+
keyPath,
|
|
32
|
+
server,
|
|
33
|
+
url: server.url,
|
|
34
|
+
port: server.port,
|
|
35
|
+
getSeenRequests: () => endpoint.getSeenRequests(),
|
|
36
|
+
async stop() {
|
|
37
|
+
await server.stop();
|
|
38
|
+
await fs_1.promises.rm(certDir, { recursive: true, force: true });
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
function awsActionsFromRequests(requests) {
|
|
43
|
+
return [...new Set(requests
|
|
44
|
+
.map(req => req.body.buffer.toString('utf-8'))
|
|
45
|
+
.map(body => querystring.decode(body))
|
|
46
|
+
.map(x => x.Action)
|
|
47
|
+
.filter(action => action != null))];
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJwcm94eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQU9BLDRDQXFDQztBQWFELHdEQU1DO0FBL0RELDJCQUFvQztBQUNwQyxnREFBZ0Q7QUFDaEQseUJBQXlCO0FBQ3pCLDZCQUE2QjtBQUM3QixtQ0FBbUM7QUFHNUIsS0FBSyxVQUFVLGdCQUFnQixDQUFDLFdBQW9CO0lBQ3pELE1BQU0sT0FBTyxHQUFHLE1BQU0sYUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsYUFBWCxXQUFXLGNBQVgsV0FBVyxHQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO0lBQ2hGLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2hELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBRTlDLDZCQUE2QjtJQUM3QixNQUFNLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLE1BQU0sT0FBTyxDQUFDLHFCQUFxQixFQUFFLENBQUM7SUFDNUQsTUFBTSxhQUFFLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsQ0FBQztJQUNqQyxNQUFNLGFBQUUsQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBRW5DLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUM7UUFDOUIsS0FBSyxFQUFFLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFO0tBQ2hELENBQUMsQ0FBQztJQUVILG9EQUFvRDtJQUNwRCxrREFBa0Q7SUFDbEQsTUFBTSxRQUFRLEdBQUcsTUFBTSxNQUFNO1NBQzFCLGFBQWEsRUFBRTtTQUNmLGVBQWUsRUFBRSxDQUFDO0lBRXJCLE1BQU0sSUFBSSxHQUFHLElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQztJQUV0RCx3QkFBd0I7SUFDeEIsTUFBTSxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXpCLE9BQU87UUFDTCxRQUFRO1FBQ1IsT0FBTztRQUNQLE1BQU07UUFDTixHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUc7UUFDZixJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUk7UUFDakIsZUFBZSxFQUFFLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUU7UUFDakQsS0FBSyxDQUFDLElBQUk7WUFDUixNQUFNLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNwQixNQUFNLGFBQUUsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN6RCxDQUFDO0tBQ0YsQ0FBQztBQUNKLENBQUM7QUFhRCxTQUFnQixzQkFBc0IsQ0FBQyxRQUE0QjtJQUNqRSxPQUFPLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxRQUFRO2FBQ3hCLEdBQUcsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQzthQUM3QyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQ3JDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFnQixDQUFDO2FBQzVCLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDeEMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHByb21pc2VzIGFzIGZzIH0gZnJvbSAnZnMnO1xuaW1wb3J0ICogYXMgcXVlcnlzdHJpbmcgZnJvbSAnbm9kZTpxdWVyeXN0cmluZyc7XG5pbXBvcnQgKiBhcyBvcyBmcm9tICdvcyc7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0ICogYXMgbW9ja3R0cCBmcm9tICdtb2NrdHRwJztcbmltcG9ydCB7IENvbXBsZXRlZFJlcXVlc3QgfSBmcm9tICdtb2NrdHRwJztcblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIHN0YXJ0UHJveHlTZXJ2ZXIoY2VydERpclJvb3Q/OiBzdHJpbmcpOiBQcm9taXNlPFByb3h5U2VydmVyPiB7XG4gIGNvbnN0IGNlcnREaXIgPSBhd2FpdCBmcy5ta2R0ZW1wKHBhdGguam9pbihjZXJ0RGlyUm9vdCA/PyBvcy50bXBkaXIoKSwgJ2Nkay0nKSk7XG4gIGNvbnN0IGNlcnRQYXRoID0gcGF0aC5qb2luKGNlcnREaXIsICdjZXJ0LnBlbScpO1xuICBjb25zdCBrZXlQYXRoID0gcGF0aC5qb2luKGNlcnREaXIsICdrZXkucGVtJyk7XG5cbiAgLy8gU2V0IHVwIGtleSBhbmQgY2VydGlmaWNhdGVcbiAgY29uc3QgeyBrZXksIGNlcnQgfSA9IGF3YWl0IG1vY2t0dHAuZ2VuZXJhdGVDQUNlcnRpZmljYXRlKCk7XG4gIGF3YWl0IGZzLndyaXRlRmlsZShrZXlQYXRoLCBrZXkpO1xuICBhd2FpdCBmcy53cml0ZUZpbGUoY2VydFBhdGgsIGNlcnQpO1xuXG4gIGNvbnN0IHNlcnZlciA9IG1vY2t0dHAuZ2V0TG9jYWwoe1xuICAgIGh0dHBzOiB7IGtleVBhdGg6IGtleVBhdGgsIGNlcnRQYXRoOiBjZXJ0UGF0aCB9LFxuICB9KTtcblxuICAvLyBXZSBkb24ndCBuZWVkIHRvIG1vZGlmeSBhbnkgcmVxdWVzdCwgc28gdGhlIHByb3h5XG4gIC8vIHBhc3NlcyB0aHJvdWdoIGFsbCByZXF1ZXN0cyB0byB0aGUgdGFyZ2V0IGhvc3QuXG4gIGNvbnN0IGVuZHBvaW50ID0gYXdhaXQgc2VydmVyXG4gICAgLmZvckFueVJlcXVlc3QoKVxuICAgIC50aGVuUGFzc1Rocm91Z2goKTtcblxuICBjb25zdCBwb3J0ID0gOTAwMCArIE1hdGguZmxvb3IoTWF0aC5yYW5kb20oKSAqIDEwMDAwKTtcblxuICAvLyBzZXJ2ZXIuZW5hYmxlRGVidWcoKTtcbiAgYXdhaXQgc2VydmVyLnN0YXJ0KHBvcnQpO1xuXG4gIHJldHVybiB7XG4gICAgY2VydFBhdGgsXG4gICAga2V5UGF0aCxcbiAgICBzZXJ2ZXIsXG4gICAgdXJsOiBzZXJ2ZXIudXJsLFxuICAgIHBvcnQ6IHNlcnZlci5wb3J0LFxuICAgIGdldFNlZW5SZXF1ZXN0czogKCkgPT4gZW5kcG9pbnQuZ2V0U2VlblJlcXVlc3RzKCksXG4gICAgYXN5bmMgc3RvcCgpIHtcbiAgICAgIGF3YWl0IHNlcnZlci5zdG9wKCk7XG4gICAgICBhd2FpdCBmcy5ybShjZXJ0RGlyLCB7IHJlY3Vyc2l2ZTogdHJ1ZSwgZm9yY2U6IHRydWUgfSk7XG4gICAgfSxcbiAgfTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBQcm94eVNlcnZlciB7XG4gIHJlYWRvbmx5IGNlcnRQYXRoOiBzdHJpbmc7XG4gIHJlYWRvbmx5IGtleVBhdGg6IHN0cmluZztcbiAgcmVhZG9ubHkgc2VydmVyOiBtb2NrdHRwLk1vY2t0dHA7XG4gIHJlYWRvbmx5IHVybDogc3RyaW5nO1xuICByZWFkb25seSBwb3J0OiBudW1iZXI7XG5cbiAgZ2V0U2VlblJlcXVlc3RzKCk6IFByb21pc2U8Q29tcGxldGVkUmVxdWVzdFtdPjtcbiAgc3RvcCgpOiBQcm9taXNlPHZvaWQ+O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gYXdzQWN0aW9uc0Zyb21SZXF1ZXN0cyhyZXF1ZXN0czogQ29tcGxldGVkUmVxdWVzdFtdKTogc3RyaW5nW10ge1xuICByZXR1cm4gWy4uLm5ldyBTZXQocmVxdWVzdHNcbiAgICAubWFwKHJlcSA9PiByZXEuYm9keS5idWZmZXIudG9TdHJpbmcoJ3V0Zi04JykpXG4gICAgLm1hcChib2R5ID0+IHF1ZXJ5c3RyaW5nLmRlY29kZShib2R5KSlcbiAgICAubWFwKHggPT4geC5BY3Rpb24gYXMgc3RyaW5nKVxuICAgIC5maWx0ZXIoYWN0aW9uID0+IGFjdGlvbiAhPSBudWxsKSldO1xufVxuIl19
|
package/lib/proxy.ts
ADDED
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { promises as fs } from 'fs';
|
|
2
|
+
import * as querystring from 'node:querystring';
|
|
3
|
+
import * as os from 'os';
|
|
4
|
+
import * as path from 'path';
|
|
5
|
+
import * as mockttp from 'mockttp';
|
|
6
|
+
import { CompletedRequest } from 'mockttp';
|
|
7
|
+
|
|
8
|
+
export async function startProxyServer(certDirRoot?: string): Promise<ProxyServer> {
|
|
9
|
+
const certDir = await fs.mkdtemp(path.join(certDirRoot ?? os.tmpdir(), 'cdk-'));
|
|
10
|
+
const certPath = path.join(certDir, 'cert.pem');
|
|
11
|
+
const keyPath = path.join(certDir, 'key.pem');
|
|
12
|
+
|
|
13
|
+
// Set up key and certificate
|
|
14
|
+
const { key, cert } = await mockttp.generateCACertificate();
|
|
15
|
+
await fs.writeFile(keyPath, key);
|
|
16
|
+
await fs.writeFile(certPath, cert);
|
|
17
|
+
|
|
18
|
+
const server = mockttp.getLocal({
|
|
19
|
+
https: { keyPath: keyPath, certPath: certPath },
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
// We don't need to modify any request, so the proxy
|
|
23
|
+
// passes through all requests to the target host.
|
|
24
|
+
const endpoint = await server
|
|
25
|
+
.forAnyRequest()
|
|
26
|
+
.thenPassThrough();
|
|
27
|
+
|
|
28
|
+
const port = 9000 + Math.floor(Math.random() * 10000);
|
|
29
|
+
|
|
30
|
+
// server.enableDebug();
|
|
31
|
+
await server.start(port);
|
|
32
|
+
|
|
33
|
+
return {
|
|
34
|
+
certPath,
|
|
35
|
+
keyPath,
|
|
36
|
+
server,
|
|
37
|
+
url: server.url,
|
|
38
|
+
port: server.port,
|
|
39
|
+
getSeenRequests: () => endpoint.getSeenRequests(),
|
|
40
|
+
async stop() {
|
|
41
|
+
await server.stop();
|
|
42
|
+
await fs.rm(certDir, { recursive: true, force: true });
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export interface ProxyServer {
|
|
48
|
+
readonly certPath: string;
|
|
49
|
+
readonly keyPath: string;
|
|
50
|
+
readonly server: mockttp.Mockttp;
|
|
51
|
+
readonly url: string;
|
|
52
|
+
readonly port: number;
|
|
53
|
+
|
|
54
|
+
getSeenRequests(): Promise<CompletedRequest[]>;
|
|
55
|
+
stop(): Promise<void>;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export function awsActionsFromRequests(requests: CompletedRequest[]): string[] {
|
|
59
|
+
return [...new Set(requests
|
|
60
|
+
.map(req => req.body.buffer.toString('utf-8'))
|
|
61
|
+
.map(body => querystring.decode(body))
|
|
62
|
+
.map(x => x.Action as string)
|
|
63
|
+
.filter(action => action != null))];
|
|
64
|
+
}
|
package/lib/with-aws.d.ts
CHANGED
|
@@ -2,6 +2,9 @@ import { AwsClients } from './aws';
|
|
|
2
2
|
import { TestContext } from './integ-test';
|
|
3
3
|
import { ResourcePool } from './resource-pool';
|
|
4
4
|
import { DisableBootstrapContext } from './with-cdk-app';
|
|
5
|
+
export declare function atmosphereEnabled(): boolean;
|
|
6
|
+
export declare function atmosphereEndpoint(): string;
|
|
7
|
+
export declare function atmospherePool(): string;
|
|
5
8
|
export type AwsContext = {
|
|
6
9
|
readonly aws: AwsClients;
|
|
7
10
|
};
|
package/lib/with-aws.js
CHANGED
|
@@ -1,20 +1,68 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.atmosphereEnabled = atmosphereEnabled;
|
|
4
|
+
exports.atmosphereEndpoint = atmosphereEndpoint;
|
|
5
|
+
exports.atmospherePool = atmospherePool;
|
|
3
6
|
exports.withAws = withAws;
|
|
4
7
|
exports.regionPool = regionPool;
|
|
8
|
+
const cdk_atmosphere_client_1 = require("@cdklabs/cdk-atmosphere-client");
|
|
5
9
|
const aws_1 = require("./aws");
|
|
6
10
|
const resource_pool_1 = require("./resource-pool");
|
|
11
|
+
function atmosphereEnabled() {
|
|
12
|
+
const enabled = process.env.CDK_INTEG_ATMOSPHERE_ENABLED;
|
|
13
|
+
return enabled === 'true' || enabled === '1';
|
|
14
|
+
}
|
|
15
|
+
function atmosphereEndpoint() {
|
|
16
|
+
const value = process.env.CDK_INTEG_ATMOSPHERE_ENDPOINT;
|
|
17
|
+
if (!value) {
|
|
18
|
+
throw new Error('CDK_INTEG_ATMOSPHERE_ENDPOINT is not defined');
|
|
19
|
+
}
|
|
20
|
+
return value;
|
|
21
|
+
}
|
|
22
|
+
function atmospherePool() {
|
|
23
|
+
const value = process.env.CDK_INTEG_ATMOSPHERE_POOL;
|
|
24
|
+
if (!value) {
|
|
25
|
+
throw new Error('CDK_INTEG_ATMOSPHERE_POOL is not defined');
|
|
26
|
+
}
|
|
27
|
+
return value;
|
|
28
|
+
}
|
|
7
29
|
/**
|
|
8
30
|
* Higher order function to execute a block with an AWS client setup
|
|
9
31
|
*
|
|
10
32
|
* Allocate the next region from the REGION pool and dispose it afterwards.
|
|
11
33
|
*/
|
|
12
34
|
function withAws(block, disableBootstrap = false) {
|
|
13
|
-
return
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
35
|
+
return async (context) => {
|
|
36
|
+
if (atmosphereEnabled()) {
|
|
37
|
+
const atmosphere = new cdk_atmosphere_client_1.AtmosphereClient(atmosphereEndpoint());
|
|
38
|
+
const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name });
|
|
39
|
+
const aws = await aws_1.AwsClients.forIdentity(allocation.environment.region, {
|
|
40
|
+
accessKeyId: allocation.credentials.accessKeyId,
|
|
41
|
+
secretAccessKey: allocation.credentials.secretAccessKey,
|
|
42
|
+
sessionToken: allocation.credentials.sessionToken,
|
|
43
|
+
accountId: allocation.environment.account,
|
|
44
|
+
}, context.output);
|
|
45
|
+
await sanityCheck(aws);
|
|
46
|
+
let outcome = 'success';
|
|
47
|
+
try {
|
|
48
|
+
return await block({ ...context, disableBootstrap, aws });
|
|
49
|
+
}
|
|
50
|
+
catch (e) {
|
|
51
|
+
outcome = 'failure';
|
|
52
|
+
throw e;
|
|
53
|
+
}
|
|
54
|
+
finally {
|
|
55
|
+
await atmosphere.release(allocation.id, outcome);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
return regionPool().using(async (region) => {
|
|
60
|
+
const aws = await aws_1.AwsClients.forRegion(region, context.output);
|
|
61
|
+
await sanityCheck(aws);
|
|
62
|
+
return block({ ...context, disableBootstrap, aws });
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
};
|
|
18
66
|
}
|
|
19
67
|
let _regionPool;
|
|
20
68
|
function regionPool() {
|
|
@@ -57,4 +105,4 @@ async function sanityCheck(aws) {
|
|
|
57
105
|
}
|
|
58
106
|
}
|
|
59
107
|
let sanityChecked;
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"with-aws.js","sourceRoot":"","sources":["with-aws.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtmosphereClient } from '@cdklabs/cdk-atmosphere-client';\nimport { AwsClients } from './aws';\nimport { TestContext } from './integ-test';\nimport { ResourcePool } from './resource-pool';\nimport { DisableBootstrapContext } from './with-cdk-app';\n\nexport function atmosphereEnabled(): boolean {\n  const enabled = process.env.CDK_INTEG_ATMOSPHERE_ENABLED;\n  return enabled === 'true' || enabled === '1';\n}\n\nexport function atmosphereEndpoint(): string {\n  const value = process.env.CDK_INTEG_ATMOSPHERE_ENDPOINT;\n  if (!value) {\n    throw new Error('CDK_INTEG_ATMOSPHERE_ENDPOINT is not defined');\n  }\n  return value;\n}\n\nexport function atmospherePool() {\n  const value = process.env.CDK_INTEG_ATMOSPHERE_POOL;\n  if (!value) {\n    throw new Error('CDK_INTEG_ATMOSPHERE_POOL is not defined');\n  }\n  return value;\n}\n\nexport type AwsContext = { readonly aws: AwsClients };\n\n/**\n * Higher order function to execute a block with an AWS client setup\n *\n * Allocate the next region from the REGION pool and dispose it afterwards.\n */\nexport function withAws<A extends TestContext>(\n  block: (context: A & AwsContext & DisableBootstrapContext) => Promise<void>,\n  disableBootstrap: boolean = false,\n): (context: A) => Promise<void> {\n  return async (context: A) => {\n    if (atmosphereEnabled()) {\n      const atmosphere = new AtmosphereClient(atmosphereEndpoint());\n      const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name });\n      const aws = await AwsClients.forIdentity(allocation.environment.region, {\n        accessKeyId: allocation.credentials.accessKeyId,\n        secretAccessKey: allocation.credentials.secretAccessKey,\n        sessionToken: allocation.credentials.sessionToken,\n        accountId: allocation.environment.account,\n      }, context.output);\n\n      await sanityCheck(aws);\n\n      let outcome = 'success';\n      try {\n        return await block({ ...context, disableBootstrap, aws });\n      } catch (e: any) {\n        outcome = 'failure';\n        throw e;\n      } finally {\n        await atmosphere.release(allocation.id, outcome);\n      }\n    } else {\n      return regionPool().using(async (region) => {\n        const aws = await AwsClients.forRegion(region, context.output);\n        await sanityCheck(aws);\n\n        return block({ ...context, disableBootstrap, aws });\n      });\n    }\n  };\n}\n\nlet _regionPool: undefined | ResourcePool;\nexport function regionPool(): ResourcePool {\n  if (_regionPool !== undefined) {\n    return _regionPool;\n  }\n\n  const REGIONS = process.env.AWS_REGIONS\n    ? process.env.AWS_REGIONS.split(',')\n    : [process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? 'us-east-1'];\n\n  // eslint-disable-next-line no-console\n  console.log(`Using regions: ${REGIONS}\\n`);\n\n  _regionPool = ResourcePool.withResources('aws_regions', REGIONS);\n  return _regionPool;\n}\n\n/**\n * Perform a one-time quick sanity check that the AWS clients have properly configured credentials\n *\n * If we don't do this, calls are going to fail and they'll be retried and everything will take\n * forever before the user notices a simple misconfiguration.\n *\n * We can't check for the presence of environment variables since credentials could come from\n * anywhere, so do simple account retrieval.\n *\n * Only do it once per process.\n */\nasync function sanityCheck(aws: AwsClients) {\n  if (sanityChecked === undefined) {\n    try {\n      await aws.account();\n      sanityChecked = true;\n    } catch (e: any) {\n      sanityChecked = false;\n      throw new Error(`AWS credentials probably not configured, got error: ${e.message}`);\n    }\n  }\n  if (!sanityChecked) {\n    throw new Error('AWS credentials probably not configured, see previous error');\n  }\n}\nlet sanityChecked: boolean | undefined;\n"]}
|
package/lib/with-aws.ts
CHANGED
|
@@ -1,8 +1,30 @@
|
|
|
1
|
+
import { AtmosphereClient } from '@cdklabs/cdk-atmosphere-client';
|
|
1
2
|
import { AwsClients } from './aws';
|
|
2
3
|
import { TestContext } from './integ-test';
|
|
3
4
|
import { ResourcePool } from './resource-pool';
|
|
4
5
|
import { DisableBootstrapContext } from './with-cdk-app';
|
|
5
6
|
|
|
7
|
+
export function atmosphereEnabled(): boolean {
|
|
8
|
+
const enabled = process.env.CDK_INTEG_ATMOSPHERE_ENABLED;
|
|
9
|
+
return enabled === 'true' || enabled === '1';
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export function atmosphereEndpoint(): string {
|
|
13
|
+
const value = process.env.CDK_INTEG_ATMOSPHERE_ENDPOINT;
|
|
14
|
+
if (!value) {
|
|
15
|
+
throw new Error('CDK_INTEG_ATMOSPHERE_ENDPOINT is not defined');
|
|
16
|
+
}
|
|
17
|
+
return value;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export function atmospherePool() {
|
|
21
|
+
const value = process.env.CDK_INTEG_ATMOSPHERE_POOL;
|
|
22
|
+
if (!value) {
|
|
23
|
+
throw new Error('CDK_INTEG_ATMOSPHERE_POOL is not defined');
|
|
24
|
+
}
|
|
25
|
+
return value;
|
|
26
|
+
}
|
|
27
|
+
|
|
6
28
|
export type AwsContext = { readonly aws: AwsClients };
|
|
7
29
|
|
|
8
30
|
/**
|
|
@@ -14,12 +36,37 @@ export function withAws<A extends TestContext>(
|
|
|
14
36
|
block: (context: A & AwsContext & DisableBootstrapContext) => Promise<void>,
|
|
15
37
|
disableBootstrap: boolean = false,
|
|
16
38
|
): (context: A) => Promise<void> {
|
|
17
|
-
return (context: A) =>
|
|
18
|
-
|
|
19
|
-
|
|
39
|
+
return async (context: A) => {
|
|
40
|
+
if (atmosphereEnabled()) {
|
|
41
|
+
const atmosphere = new AtmosphereClient(atmosphereEndpoint());
|
|
42
|
+
const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name });
|
|
43
|
+
const aws = await AwsClients.forIdentity(allocation.environment.region, {
|
|
44
|
+
accessKeyId: allocation.credentials.accessKeyId,
|
|
45
|
+
secretAccessKey: allocation.credentials.secretAccessKey,
|
|
46
|
+
sessionToken: allocation.credentials.sessionToken,
|
|
47
|
+
accountId: allocation.environment.account,
|
|
48
|
+
}, context.output);
|
|
49
|
+
|
|
50
|
+
await sanityCheck(aws);
|
|
20
51
|
|
|
21
|
-
|
|
22
|
-
|
|
52
|
+
let outcome = 'success';
|
|
53
|
+
try {
|
|
54
|
+
return await block({ ...context, disableBootstrap, aws });
|
|
55
|
+
} catch (e: any) {
|
|
56
|
+
outcome = 'failure';
|
|
57
|
+
throw e;
|
|
58
|
+
} finally {
|
|
59
|
+
await atmosphere.release(allocation.id, outcome);
|
|
60
|
+
}
|
|
61
|
+
} else {
|
|
62
|
+
return regionPool().using(async (region) => {
|
|
63
|
+
const aws = await AwsClients.forRegion(region, context.output);
|
|
64
|
+
await sanityCheck(aws);
|
|
65
|
+
|
|
66
|
+
return block({ ...context, disableBootstrap, aws });
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
};
|
|
23
70
|
}
|
|
24
71
|
|
|
25
72
|
let _regionPool: undefined | ResourcePool;
|
package/lib/with-cdk-app.d.ts
CHANGED
|
@@ -18,8 +18,7 @@ export declare function withSpecificCdkApp(appName: string, block: (context: Tes
|
|
|
18
18
|
* Like `withSpecificCdkApp`, but uses the default integration testing app with a million stacks in it
|
|
19
19
|
*/
|
|
20
20
|
export declare function withCdkApp(block: (context: TestFixture) => Promise<void>): (context: TestContext & AwsContext & DisableBootstrapContext) => Promise<void>;
|
|
21
|
-
export declare function withCdkMigrateApp
|
|
22
|
-
export declare function withMonolithicCfnIncludeCdkApp<A extends TestContext>(block: (context: TestFixture) => Promise<void>): (context: A) => Promise<void>;
|
|
21
|
+
export declare function withCdkMigrateApp(language: string, block: (context: TestFixture) => Promise<void>): (context: TestContext & AwsContext & DisableBootstrapContext) => Promise<void>;
|
|
23
22
|
/**
|
|
24
23
|
* Default test fixture for most (all?) integ tests
|
|
25
24
|
*
|
|
@@ -125,6 +124,8 @@ export interface CdkModernBootstrapCommandOptions extends CommonCdkBootstrapComm
|
|
|
125
124
|
* @default undefined
|
|
126
125
|
*/
|
|
127
126
|
readonly usePreviousParameters?: boolean;
|
|
127
|
+
readonly trust?: string[];
|
|
128
|
+
readonly untrust?: string[];
|
|
128
129
|
}
|
|
129
130
|
export interface CdkGarbageCollectionCommandOptions {
|
|
130
131
|
/**
|
|
@@ -159,6 +160,7 @@ export declare class TestFixture extends ShellHelper {
|
|
|
159
160
|
constructor(integTestDir: string, stackNamePrefix: string, output: NodeJS.WritableStream, aws: AwsClients, randomString: string);
|
|
160
161
|
log(s: string): void;
|
|
161
162
|
cdkDeploy(stackNames: string | string[], options?: CdkCliOptions, skipStackRename?: boolean): Promise<string>;
|
|
163
|
+
cdkDeployCommandLine(stackNames: string | string[], options?: CdkCliOptions, skipStackRename?: boolean): string[];
|
|
162
164
|
cdkSynth(options?: CdkCliOptions): Promise<string>;
|
|
163
165
|
cdkDestroy(stackNames: string | string[], options?: CdkCliOptions): Promise<string>;
|
|
164
166
|
cdkBootstrapLegacy(options: CdkLegacyBootstrapCommandOptions): Promise<string>;
|
|
@@ -166,6 +168,16 @@ export declare class TestFixture extends ShellHelper {
|
|
|
166
168
|
cdkGarbageCollect(options: CdkGarbageCollectionCommandOptions): Promise<string>;
|
|
167
169
|
cdkMigrate(language: string, stackName: string, inputPath?: string, options?: CdkCliOptions): Promise<string>;
|
|
168
170
|
cdk(args: string[], options?: CdkCliOptions): Promise<string>;
|
|
171
|
+
/**
|
|
172
|
+
* Return the environment variables with which to execute CDK
|
|
173
|
+
*/
|
|
174
|
+
cdkShellEnv(): {
|
|
175
|
+
AWS_REGION: string;
|
|
176
|
+
AWS_DEFAULT_REGION: string;
|
|
177
|
+
STACK_NAME_PREFIX: string;
|
|
178
|
+
PACKAGE_LAYOUT_VERSION: string;
|
|
179
|
+
CI: string;
|
|
180
|
+
};
|
|
169
181
|
template(stackName: string): any;
|
|
170
182
|
bootstrapRepoName(): Promise<string>;
|
|
171
183
|
get bootstrapStackName(): string;
|
|
@@ -188,6 +200,13 @@ export declare class TestFixture extends ShellHelper {
|
|
|
188
200
|
private deleteableStacks;
|
|
189
201
|
private sortBootstrapStacksToTheEnd;
|
|
190
202
|
}
|
|
203
|
+
/**
|
|
204
|
+
* Make sure that the given environment is bootstrapped
|
|
205
|
+
*
|
|
206
|
+
* Since we go striping across regions, it's going to suck doing this
|
|
207
|
+
* by hand so let's just mass-automate it.
|
|
208
|
+
*/
|
|
209
|
+
export declare function ensureBootstrapped(fixture: TestFixture): Promise<void>;
|
|
191
210
|
/**
|
|
192
211
|
* Install the given NPM packages, identified by their names and versions
|
|
193
212
|
*
|