@aws-cdk-testing/cli-integ 2.176.0 → 2.178.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/lib/aws.d.ts +8 -2
- package/lib/aws.js +22 -8
- package/lib/cli/run-suite.js +2 -1
- package/lib/cli/stage-distribution.js +1 -1
- package/lib/github.js +1 -2
- package/lib/integ-test.d.ts +1 -0
- package/lib/integ-test.js +39 -7
- package/lib/package-sources/release-source.js +1 -1
- package/lib/package-sources/repo-source.d.ts +4 -4
- package/lib/package-sources/repo-source.js +5 -5
- package/lib/proxy.d.ts +13 -0
- package/lib/proxy.js +49 -0
- package/lib/shell.d.ts +5 -2
- package/lib/shell.js +20 -8
- package/lib/with-aws.d.ts +3 -0
- package/lib/with-aws.js +54 -6
- package/lib/with-cdk-app.d.ts +21 -2
- package/lib/with-cdk-app.js +76 -72
- package/lib/with-cli-lib.d.ts +2 -2
- package/lib/with-cli-lib.js +6 -1
- package/lib/with-sam.js +27 -21
- package/package.json +5 -4
- package/resources/cdk-apps/app/app.js +3 -3
- package/resources/cdk-apps/rollback-test-app/app.js +1 -1
- package/resources/cdk-apps/sam_cdk_integ_app/lib/test-stack.js +3 -1
- package/resources/cdk-apps/sam_cdk_integ_app/src/docker/DockerImageFunctionConstruct/Dockerfile +2 -0
- package/resources/cli-regression-patches/v1.130.0/bootstrapping.integtest.js +1 -1
- package/resources/integ.jest.config.js +4 -1
- package/tests/cli-integ-tests/bootstrapping.integtest.js +19 -1
- package/tests/cli-integ-tests/cli.integtest.js +16 -38
- package/tests/cli-integ-tests/proxy.integtest.d.ts +1 -0
- package/tests/cli-integ-tests/proxy.integtest.js +146 -0
- package/tests/init-go/init-go.integtest.js +6 -2
- package/tests/init-javascript/init-javascript.integtest.js +1 -1
- package/tests/init-typescript-app/init-typescript-app.integtest.js +3 -3
- package/tests/uberpackage/uberpackage.integtest.js +2 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const fs_1 = require("fs");
|
|
4
|
+
const os = require("os");
|
|
5
|
+
const path = require("path");
|
|
6
|
+
const integ_test_1 = require("../../lib/integ-test");
|
|
7
|
+
const proxy_1 = require("../../lib/proxy");
|
|
8
|
+
const with_cdk_app_1 = require("../../lib/with-cdk-app");
|
|
9
|
+
const docker = process.env.CDK_DOCKER ?? 'docker';
|
|
10
|
+
(0, integ_test_1.integTest)('all calls from isolated container go through proxy', (0, with_cdk_app_1.withDefaultFixture)(async (fixture) => {
|
|
11
|
+
// Find the 'cdk' command and make sure it is mounted into the container
|
|
12
|
+
const cdkFullpath = (await fixture.shell(['which', 'cdk'])).trim();
|
|
13
|
+
let cdkTop = findMountableParent(cdkFullpath);
|
|
14
|
+
// Run a 'cdk deploy' inside the container
|
|
15
|
+
const commands = [
|
|
16
|
+
`env ${renderEnv(fixture.cdkShellEnv())} ${cdkFullpath} ${fixture.cdkDeployCommandLine('test-2').join(' ')} -v`,
|
|
17
|
+
];
|
|
18
|
+
await runInIsolatedContainer(fixture, [cdkTop], commands);
|
|
19
|
+
}));
|
|
20
|
+
async function runInIsolatedContainer(fixture, pathsToMount, testCommands) {
|
|
21
|
+
pathsToMount.push(`${process.env.HOME}`, fixture.integTestDir);
|
|
22
|
+
// Resolve credential provider to an access key that we can pass into the container
|
|
23
|
+
const credentials = await fixture.aws.credentials();
|
|
24
|
+
const proxy = await (0, proxy_1.startProxyServer)(fixture.integTestDir);
|
|
25
|
+
try {
|
|
26
|
+
const proxyPort = proxy.port;
|
|
27
|
+
const setupCommands = [
|
|
28
|
+
'apt-get update -qq',
|
|
29
|
+
'apt-get install -qqy nodejs > /dev/null',
|
|
30
|
+
...isolatedDockerCommands(proxyPort, proxy.certPath),
|
|
31
|
+
];
|
|
32
|
+
const scriptName = path.join(fixture.integTestDir, 'script.sh');
|
|
33
|
+
// Write a script file
|
|
34
|
+
await fs_1.promises.writeFile(scriptName, [
|
|
35
|
+
'#!/bin/bash',
|
|
36
|
+
'set -x',
|
|
37
|
+
'set -eu',
|
|
38
|
+
...setupCommands,
|
|
39
|
+
...testCommands,
|
|
40
|
+
].join('\n'), 'utf-8');
|
|
41
|
+
await fs_1.promises.chmod(scriptName, 0o755);
|
|
42
|
+
// Run commands in a Docker shell
|
|
43
|
+
await fixture.shell([
|
|
44
|
+
docker, 'run', '--net=bridge', '--rm',
|
|
45
|
+
...pathsToMount.flatMap(p => ['-v', `${p}:${p}`]),
|
|
46
|
+
...['HOME', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'AWS_SESSION_TOKEN'].flatMap(e => ['-e', e]),
|
|
47
|
+
'-w', fixture.integTestDir,
|
|
48
|
+
'--cap-add=NET_ADMIN',
|
|
49
|
+
'public.ecr.aws/ubuntu/ubuntu:24.04_stable',
|
|
50
|
+
`${scriptName}`,
|
|
51
|
+
], {
|
|
52
|
+
stdio: 'inherit',
|
|
53
|
+
modEnv: {
|
|
54
|
+
AWS_ACCESS_KEY_ID: credentials.accessKeyId,
|
|
55
|
+
AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
|
|
56
|
+
AWS_SESSION_TOKEN: credentials.sessionToken,
|
|
57
|
+
},
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
await proxy.stop();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Return the commands necessary to isolate the inside of the container from the internet,
|
|
66
|
+
* except by going through the proxy
|
|
67
|
+
*/
|
|
68
|
+
function isolatedDockerCommands(proxyPort, caBundlePath) {
|
|
69
|
+
let defaultBridgeIp = '172.17.0.1';
|
|
70
|
+
// The host's default IP is different on CodeBuild than it is on other Docker systems.
|
|
71
|
+
if (process.env.CODEBUILD_BUILD_ARN) {
|
|
72
|
+
defaultBridgeIp = '172.18.0.1';
|
|
73
|
+
}
|
|
74
|
+
return [
|
|
75
|
+
'echo Working...',
|
|
76
|
+
'apt-get install -qqy curl net-tools iputils-ping dnsutils iptables > /dev/null',
|
|
77
|
+
'',
|
|
78
|
+
// Looking up `host.docker.internal` is necessary on MacOS Finch and Docker Desktop
|
|
79
|
+
// on Mac. The magic IP address is necessary on CodeBuild and GitHub Actions.
|
|
80
|
+
//
|
|
81
|
+
// I tried `--add-host=host.docker.internal:host-gateway` on the Linuxes but
|
|
82
|
+
// it doesn't change anything on either GHA or CodeBuild, so we're left with this
|
|
83
|
+
// backup solution.
|
|
84
|
+
'gateway=$(dig +short host.docker.internal)',
|
|
85
|
+
'if [[ -z "$gateway" ]]; then',
|
|
86
|
+
` gateway=${defaultBridgeIp}`,
|
|
87
|
+
'fi',
|
|
88
|
+
'',
|
|
89
|
+
'# Some iptables manipulation; there might be unnecessary commands in here, not an expert',
|
|
90
|
+
'iptables -F',
|
|
91
|
+
'iptables -X',
|
|
92
|
+
'iptables -P INPUT DROP',
|
|
93
|
+
'iptables -P OUTPUT DROP',
|
|
94
|
+
'iptables -P FORWARD DROP',
|
|
95
|
+
'iptables -A INPUT -i lo -j ACCEPT',
|
|
96
|
+
'iptables -A OUTPUT -o lo -j ACCEPT',
|
|
97
|
+
'iptables -A OUTPUT -d $gateway -j ACCEPT',
|
|
98
|
+
'iptables -A INPUT -s $gateway -j ACCEPT',
|
|
99
|
+
'',
|
|
100
|
+
'',
|
|
101
|
+
`if [[ ! -f ${caBundlePath} ]]; then`,
|
|
102
|
+
` echo "Could not find ${caBundlePath}, this will probably not go well. Exiting." >&2`,
|
|
103
|
+
' exit 1',
|
|
104
|
+
'fi',
|
|
105
|
+
'',
|
|
106
|
+
'# Configure a bunch of tools to work with the proxy',
|
|
107
|
+
'echo "+-------------------------------------------------------------------------------------+"',
|
|
108
|
+
'echo "| Direct network traffic has been blocked, everything must go through the proxy. |"',
|
|
109
|
+
'echo "+-------------------------------------------------------------------------------------+"',
|
|
110
|
+
`export HTTP_PROXY=http://$gateway:${proxyPort}/`,
|
|
111
|
+
`export HTTPS_PROXY=http://$gateway:${proxyPort}/`,
|
|
112
|
+
`export NODE_EXTRA_CA_CERTS=${caBundlePath}`,
|
|
113
|
+
`export AWS_CA_BUNDLE=${caBundlePath}`,
|
|
114
|
+
`export SSL_CERT_FILE=${caBundlePath}`,
|
|
115
|
+
'echo "Acquire::http::proxy \"$HTTP_PROXY\";" >> /etc/apt/apt.conf.d/95proxies',
|
|
116
|
+
'echo "Acquire::https::proxy \"$HTTPS_PROXY\";" >> /etc/apt/apt.conf.d/95proxies',
|
|
117
|
+
];
|
|
118
|
+
}
|
|
119
|
+
function renderEnv(env) {
|
|
120
|
+
return Object.entries(env).filter(([_, v]) => v).map(([k, v]) => `${k}='${v}'`).join(' ');
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Find a broadly mountable parent of the given directory
|
|
124
|
+
*
|
|
125
|
+
* We don't want to just mount the top-level directory, because
|
|
126
|
+
* it could end up being `/var` (top-level dir of tmpdir on Mac).
|
|
127
|
+
*/
|
|
128
|
+
function findMountableParent(dir) {
|
|
129
|
+
const candidates = [
|
|
130
|
+
os.tmpdir(),
|
|
131
|
+
process.env.TMPDIR,
|
|
132
|
+
process.env.HOME,
|
|
133
|
+
];
|
|
134
|
+
for (const cand of candidates) {
|
|
135
|
+
if (cand === undefined) {
|
|
136
|
+
continue;
|
|
137
|
+
}
|
|
138
|
+
if (dir.startsWith(cand)) {
|
|
139
|
+
const suffix = dir.substring(cand.length);
|
|
140
|
+
const firstChildDir = suffix.split('/')[0];
|
|
141
|
+
return path.join(cand, firstChildDir);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
return dir;
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"proxy.integtest.js","sourceRoot":"","sources":["proxy.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'fs';\nimport * as os from 'os';\nimport * as path from 'path';\nimport { integTest } from '../../lib/integ-test';\nimport { startProxyServer } from '../../lib/proxy';\nimport { TestFixture, withDefaultFixture } from '../../lib/with-cdk-app';\n\nconst docker = process.env.CDK_DOCKER ?? 'docker';\n\nintegTest(\n  'all calls from isolated container go through proxy',\n  withDefaultFixture(async (fixture) => {\n    // Find the 'cdk' command and make sure it is mounted into the container\n    const cdkFullpath = (await fixture.shell(['which', 'cdk'])).trim();\n    let cdkTop = findMountableParent(cdkFullpath);\n\n    // Run a 'cdk deploy' inside the container\n    const commands = [\n      `env ${renderEnv(fixture.cdkShellEnv())} ${cdkFullpath} ${fixture.cdkDeployCommandLine('test-2').join(' ')} -v`,\n    ];\n\n    await runInIsolatedContainer(fixture, [cdkTop], commands);\n  }),\n);\n\nasync function runInIsolatedContainer(fixture: TestFixture, pathsToMount: string[], testCommands: string[]) {\n  pathsToMount.push(\n    `${process.env.HOME}`,\n    fixture.integTestDir,\n  );\n\n  // Resolve credential provider to an access key that we can pass into the container\n  const credentials = await fixture.aws.credentials();\n\n  const proxy = await startProxyServer(fixture.integTestDir);\n  try {\n    const proxyPort = proxy.port;\n\n    const setupCommands = [\n      'apt-get update -qq',\n      'apt-get install -qqy nodejs > /dev/null',\n      ...isolatedDockerCommands(proxyPort, proxy.certPath),\n    ];\n\n    const scriptName = path.join(fixture.integTestDir, 'script.sh');\n\n    // Write a script file\n    await fs.writeFile(scriptName, [\n      '#!/bin/bash',\n      'set -x',\n      'set -eu',\n      ...setupCommands,\n      ...testCommands,\n    ].join('\\n'), 'utf-8');\n\n    await fs.chmod(scriptName, 0o755);\n\n    // Run commands in a Docker shell\n    await fixture.shell([\n      docker, 'run', '--net=bridge', '--rm',\n      ...pathsToMount.flatMap(p => ['-v', `${p}:${p}`]),\n      ...['HOME', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'AWS_SESSION_TOKEN'].flatMap(e => ['-e', e]),\n      '-w', fixture.integTestDir,\n      '--cap-add=NET_ADMIN',\n      'public.ecr.aws/ubuntu/ubuntu:24.04_stable',\n      `${scriptName}`,\n    ], {\n      stdio: 'inherit',\n      modEnv: {\n        AWS_ACCESS_KEY_ID: credentials.accessKeyId,\n        AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,\n        AWS_SESSION_TOKEN: credentials.sessionToken,\n      },\n    });\n  } finally {\n    await proxy.stop();\n  }\n}\n\n/**\n * Return the commands necessary to isolate the inside of the container from the internet,\n * except by going through the proxy\n */\nfunction isolatedDockerCommands(proxyPort: number, caBundlePath: string) {\n  let defaultBridgeIp = '172.17.0.1';\n\n  // The host's default IP is different on CodeBuild than it is on other Docker systems.\n  if (process.env.CODEBUILD_BUILD_ARN) {\n    defaultBridgeIp = '172.18.0.1';\n  }\n\n  return [\n    'echo Working...',\n    'apt-get install -qqy curl net-tools iputils-ping dnsutils iptables > /dev/null',\n    '',\n    // Looking up `host.docker.internal` is necessary on MacOS Finch and Docker Desktop\n    // on Mac. The magic IP address is necessary on CodeBuild and GitHub Actions.\n    //\n    // I tried `--add-host=host.docker.internal:host-gateway` on the Linuxes but\n    // it doesn't change anything on either GHA or CodeBuild, so we're left with this\n    // backup solution.\n    'gateway=$(dig +short host.docker.internal)',\n    'if [[ -z \"$gateway\" ]]; then',\n    `  gateway=${defaultBridgeIp}`,\n    'fi',\n    '',\n    '# Some iptables manipulation; there might be unnecessary commands in here, not an expert',\n    'iptables -F',\n    'iptables -X',\n    'iptables -P INPUT DROP',\n    'iptables -P OUTPUT DROP',\n    'iptables -P FORWARD DROP',\n    'iptables -A INPUT -i lo -j ACCEPT',\n    'iptables -A OUTPUT -o lo -j ACCEPT',\n    'iptables -A OUTPUT -d $gateway -j ACCEPT',\n    'iptables -A INPUT -s $gateway -j ACCEPT',\n    '',\n    '',\n    `if [[ ! -f ${caBundlePath} ]]; then`,\n    `    echo \"Could not find ${caBundlePath}, this will probably not go well. Exiting.\" >&2`,\n    '    exit 1',\n    'fi',\n    '',\n    '# Configure a bunch of tools to work with the proxy',\n    'echo \"+-------------------------------------------------------------------------------------+\"',\n    'echo \"|  Direct network traffic has been blocked, everything must go through the proxy.     |\"',\n    'echo \"+-------------------------------------------------------------------------------------+\"',\n    `export HTTP_PROXY=http://$gateway:${proxyPort}/`,\n    `export HTTPS_PROXY=http://$gateway:${proxyPort}/`,\n    `export NODE_EXTRA_CA_CERTS=${caBundlePath}`,\n    `export AWS_CA_BUNDLE=${caBundlePath}`,\n    `export SSL_CERT_FILE=${caBundlePath}`,\n    'echo \"Acquire::http::proxy \\\"$HTTP_PROXY\\\";\" >> /etc/apt/apt.conf.d/95proxies',\n    'echo \"Acquire::https::proxy \\\"$HTTPS_PROXY\\\";\" >> /etc/apt/apt.conf.d/95proxies',\n  ];\n}\n\nfunction renderEnv(env: Record<string, string | undefined>) {\n  return Object.entries(env).filter(([_, v]) => v).map(([k, v]) => `${k}='${v}'`).join(' ');\n}\n\n/**\n * Find a broadly mountable parent of the given directory\n *\n * We don't want to just mount the top-level directory, because\n * it could end up being `/var` (top-level dir of tmpdir on Mac).\n */\nfunction findMountableParent(dir: string): string {\n  const candidates = [\n    os.tmpdir(),\n    process.env.TMPDIR,\n    process.env.HOME,\n  ];\n  for (const cand of candidates) {\n    if (cand === undefined) {\n      continue;\n    }\n\n    if (dir.startsWith(cand)) {\n      const suffix = dir.substring(cand.length);\n      const firstChildDir = suffix.split('/')[0];\n\n      return path.join(cand, firstChildDir);\n    }\n  }\n  return dir;\n}\n"]}
|
|
@@ -11,11 +11,15 @@ const lib_1 = require("../../lib");
|
|
|
11
11
|
// Canaries will use the generated go.mod as is
|
|
12
12
|
// For pipeline tests we replace the source with the locally build one
|
|
13
13
|
if (!isCanary) {
|
|
14
|
-
|
|
14
|
+
const dir = process.env.CODEBUILD_SRC_DIR ?? process.env.GITHUB_WORKSPACE;
|
|
15
|
+
if (!dir) {
|
|
16
|
+
throw new Error('Cannot figure out CI system root directory');
|
|
17
|
+
}
|
|
18
|
+
await shell.shell(['go', 'mod', 'edit', '-replace', `github.com/aws/aws-cdk-go/awscdk/v2=${dir}/go/awscdk`]);
|
|
15
19
|
}
|
|
16
20
|
await shell.shell(['go', 'mod', 'tidy']);
|
|
17
21
|
await shell.shell(['go', 'test']);
|
|
18
22
|
await shell.shell(['cdk', 'synth']);
|
|
19
23
|
})));
|
|
20
24
|
});
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC1nby5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbml0LWdvLmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG1DQUF5RjtBQUV6RixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDdkMsSUFBQSxlQUFTLEVBQUMsV0FBVyxRQUFRLEVBQUUsRUFBRSxJQUFBLDRCQUFzQixFQUFDLElBQUEsa0JBQVksRUFBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7UUFDckYsTUFBTSxRQUFRLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDO1FBQ3pDLE9BQU8sQ0FBQyxRQUFRLENBQUMsMkJBQTJCLEVBQUUsQ0FBQztRQUUvQyxNQUFNLEtBQUssR0FBRyxpQkFBVyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMvQyxNQUFNLE9BQU8sQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUUxQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUV6RCwrQ0FBK0M7UUFDL0Msc0VBQXNFO1FBQ3RFLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNkLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQztZQUMxRSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7Z0JBQ1QsTUFBTSxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFDO1lBQ2hFLENBQUM7WUFFRCxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsdUNBQXVDLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQztRQUMvRyxDQUFDO1FBRUQsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ3pDLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoVGVtcG9yYXJ5RGlyZWN0b3J5LCBTaGVsbEhlbHBlciwgd2l0aFBhY2thZ2VzIH0gZnJvbSAnLi4vLi4vbGliJztcblxuWydhcHAnLCAnc2FtcGxlLWFwcCddLmZvckVhY2godGVtcGxhdGUgPT4ge1xuICBpbnRlZ1Rlc3QoYGluaXQgZ28gJHt0ZW1wbGF0ZX1gLCB3aXRoVGVtcG9yYXJ5RGlyZWN0b3J5KHdpdGhQYWNrYWdlcyhhc3luYyAoY29udGV4dCkgPT4ge1xuICAgIGNvbnN0IGlzQ2FuYXJ5ID0gISFwcm9jZXNzLmVudi5JU19DQU5BUlk7XG4gICAgY29udGV4dC5wYWNrYWdlcy5hc3NlcnRKc2lpUGFja2FnZXNBdmFpbGFibGUoKTtcblxuICAgIGNvbnN0IHNoZWxsID0gU2hlbGxIZWxwZXIuZnJvbUNvbnRleHQoY29udGV4dCk7XG4gICAgYXdhaXQgY29udGV4dC5wYWNrYWdlcy5tYWtlQ2xpQXZhaWxhYmxlKCk7XG5cbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ2NkaycsICdpbml0JywgJy1sJywgJ2dvJywgdGVtcGxhdGVdKTtcblxuICAgIC8vIENhbmFyaWVzIHdpbGwgdXNlIHRoZSBnZW5lcmF0ZWQgZ28ubW9kIGFzIGlzXG4gICAgLy8gRm9yIHBpcGVsaW5lIHRlc3RzIHdlIHJlcGxhY2UgdGhlIHNvdXJjZSB3aXRoIHRoZSBsb2NhbGx5IGJ1aWxkIG9uZVxuICAgIGlmICghaXNDYW5hcnkpIHtcbiAgICAgIGNvbnN0IGRpciA9IHByb2Nlc3MuZW52LkNPREVCVUlMRF9TUkNfRElSID8/IHByb2Nlc3MuZW52LkdJVEhVQl9XT1JLU1BBQ0U7XG4gICAgICBpZiAoIWRpcikge1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ0Nhbm5vdCBmaWd1cmUgb3V0IENJIHN5c3RlbSByb290IGRpcmVjdG9yeScpO1xuICAgICAgfVxuXG4gICAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ2dvJywgJ21vZCcsICdlZGl0JywgJy1yZXBsYWNlJywgYGdpdGh1Yi5jb20vYXdzL2F3cy1jZGstZ28vYXdzY2RrL3YyPSR7ZGlyfS9nby9hd3NjZGtgXSk7XG4gICAgfVxuXG4gICAgYXdhaXQgc2hlbGwuc2hlbGwoWydnbycsICdtb2QnLCAndGlkeSddKTtcbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ2dvJywgJ3Rlc3QnXSk7XG4gICAgYXdhaXQgc2hlbGwuc2hlbGwoWydjZGsnLCAnc3ludGgnXSk7XG4gIH0pKSk7XG59KTtcbiJdfQ==
|
|
@@ -50,4 +50,4 @@ new TestjsStack(app, 'TestjsStack');
|
|
|
50
50
|
await fs.writeJson(path.join(context.integTestDir, 'cdk.json'), cdkJson);
|
|
51
51
|
await shell.shell(['cdk', 'synth']);
|
|
52
52
|
})));
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC1qYXZhc2NyaXB0LmludGVndGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImluaXQtamF2YXNjcmlwdC5pbnRlZ3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSw2QkFBNkI7QUFDN0IsK0JBQStCO0FBQy9CLG1DQUF5RjtBQUV6RixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDdkMsSUFBQSxlQUFTLEVBQUMsbUJBQW1CLFFBQVEsRUFBRSxFQUFFLElBQUEsNEJBQXNCLEVBQUMsSUFBQSxrQkFBWSxFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUM3RixNQUFNLEtBQUssR0FBRyxpQkFBVyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMvQyxNQUFNLE9BQU8sQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUUxQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNqRSxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNwQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLG9EQUFvRDtRQUN0RixNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFFMUMsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDdEMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDLENBQUM7QUFFSCxJQUFBLGVBQVMsRUFBQyw2QkFBNkIsRUFBRSxJQUFBLDRCQUFzQixFQUFDLElBQUEsa0JBQVksRUFBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDN0YsdUVBQXVFO0lBQ3ZFLE1BQU0sS0FBSyxHQUFHLGlCQUFXLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQy9DLE1BQU0sT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO0lBRTFDLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBRTlELHFCQUFxQjtJQUNyQixNQUFNLEVBQUUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLG9CQUFvQixDQUFDLEVBQUU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBdUIzRSxFQUFFLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFFeEIsMkNBQTJDO0lBQzNDLE1BQU0sT0FBTyxHQUFHLE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUMvRSxPQUFPLENBQUMsR0FBRyxHQUFHLHlCQUF5QixDQUFDO0lBQ3hDLE1BQU0sRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsVUFBVSxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFFekUsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7QUFDdEMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCAqIGFzIGZzIGZyb20gJ2ZzLWV4dHJhJztcbmltcG9ydCB7IGludGVnVGVzdCwgd2l0aFRlbXBvcmFyeURpcmVjdG9yeSwgU2hlbGxIZWxwZXIsIHdpdGhQYWNrYWdlcyB9IGZyb20gJy4uLy4uL2xpYic7XG5cblsnYXBwJywgJ3NhbXBsZS1hcHAnXS5mb3JFYWNoKHRlbXBsYXRlID0+IHtcbiAgaW50ZWdUZXN0KGBpbml0IGphdmFzY3JpcHQgJHt0ZW1wbGF0ZX1gLCB3aXRoVGVtcG9yYXJ5RGlyZWN0b3J5KHdpdGhQYWNrYWdlcyhhc3luYyAoY29udGV4dCkgPT4ge1xuICAgIGNvbnN0IHNoZWxsID0gU2hlbGxIZWxwZXIuZnJvbUNvbnRleHQoY29udGV4dCk7XG4gICAgYXdhaXQgY29udGV4dC5wYWNrYWdlcy5tYWtlQ2xpQXZhaWxhYmxlKCk7XG5cbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ2NkaycsICdpbml0JywgJy1sJywgJ2phdmFzY3JpcHQnLCB0ZW1wbGF0ZV0pO1xuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnBtJywgJ3BydW5lJ10pO1xuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnBtJywgJ2xzJ10pOyAvLyB0aGlzIHdpbGwgZmFpbCBpZiB3ZSBoYXZlIHVubWV0IHBlZXIgZGVwZW5kZW5jaWVzXG4gICAgYXdhaXQgc2hlbGwuc2hlbGwoWyducG0nLCAncnVuJywgJ3Rlc3QnXSk7XG5cbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ2NkaycsICdzeW50aCddKTtcbiAgfSkpKTtcbn0pO1xuXG5pbnRlZ1Rlc3QoJ1Rlc3QgaW1wb3J0aW5nIENESyBmcm9tIEVTTScsIHdpdGhUZW1wb3JhcnlEaXJlY3Rvcnkod2l0aFBhY2thZ2VzKGFzeW5jIChjb250ZXh0KSA9PiB7XG4gIC8vIFVzZSAnY2RrIGluaXQgLWw9amF2YXNjcmlwdCcgdG8gZ2V0IHNldCB1cCwgYnV0IHVzZSBhIGRpZmZlcmVudCBmaWxlXG4gIGNvbnN0IHNoZWxsID0gU2hlbGxIZWxwZXIuZnJvbUNvbnRleHQoY29udGV4dCk7XG4gIGF3YWl0IGNvbnRleHQucGFja2FnZXMubWFrZUNsaUF2YWlsYWJsZSgpO1xuXG4gIGF3YWl0IHNoZWxsLnNoZWxsKFsnY2RrJywgJ2luaXQnLCAnLWwnLCAnamF2YXNjcmlwdCcsICdhcHAnXSk7XG5cbiAgLy8gUmV3cml0ZSBzb21lIGZpbGVzXG4gIGF3YWl0IGZzLndyaXRlRmlsZShwYXRoLmpvaW4oY29udGV4dC5pbnRlZ1Rlc3REaXIsICduZXctZW50cnlwb2ludC5tanMnKSwgYFxuLy8gVGVzdCBtdWx0aXBsZSBzdHlsZXMgb2YgaW1wb3J0c1xuaW1wb3J0IHsgU3RhY2ssIGF3c19zbnMgYXMgc25zIH0gZnJvbSAnYXdzLWNkay1saWInO1xuaW1wb3J0IHsgU3FzU3Vic2NyaXB0aW9uIH0gZnJvbSAnYXdzLWNkay1saWIvYXdzLXNucy1zdWJzY3JpcHRpb25zJztcbmltcG9ydCAqIGFzIHNxcyBmcm9tICdhd3MtY2RrLWxpYi9hd3Mtc3FzJztcbmltcG9ydCAqIGFzIGNkayBmcm9tICdhd3MtY2RrLWxpYic7XG5cbmNsYXNzIFRlc3Rqc1N0YWNrIGV4dGVuZHMgU3RhY2sge1xuICBjb25zdHJ1Y3RvcihzY29wZSwgaWQsIHByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCBwcm9wcyk7XG5cbiAgICBjb25zdCBxdWV1ZSA9IG5ldyBzcXMuUXVldWUodGhpcywgJ1Rlc3Rqc1F1ZXVlJywge1xuICAgICAgdmlzaWJpbGl0eVRpbWVvdXQ6IGNkay5EdXJhdGlvbi5zZWNvbmRzKDMwMClcbiAgICB9KTtcblxuICAgIGNvbnN0IHRvcGljID0gbmV3IHNucy5Ub3BpYyh0aGlzLCAnVGVzdGpzVG9waWMnKTtcblxuICAgIHRvcGljLmFkZFN1YnNjcmlwdGlvbihuZXcgU3FzU3Vic2NyaXB0aW9uKHF1ZXVlKSk7XG4gIH1cbn1cblxuY29uc3QgYXBwID0gbmV3IGNkay5BcHAoKTtcbm5ldyBUZXN0anNTdGFjayhhcHAsICdUZXN0anNTdGFjaycpO1xuYCwgeyBlbmNvZGluZzogJ3V0Zi04JyB9KTtcblxuICAvLyBSZXdyaXRlICdjZGsuanNvbicgdG8gdXNlIG5ldyBlbnRyeXBvaW50XG4gIGNvbnN0IGNka0pzb24gPSBhd2FpdCBmcy5yZWFkSnNvbihwYXRoLmpvaW4oY29udGV4dC5pbnRlZ1Rlc3REaXIsICdjZGsuanNvbicpKTtcbiAgY2RrSnNvbi5hcHAgPSAnbm9kZSBuZXctZW50cnlwb2ludC5tanMnO1xuICBhd2FpdCBmcy53cml0ZUpzb24ocGF0aC5qb2luKGNvbnRleHQuaW50ZWdUZXN0RGlyLCAnY2RrLmpzb24nKSwgY2RrSnNvbik7XG5cbiAgYXdhaXQgc2hlbGwuc2hlbGwoWydjZGsnLCAnc3ludGgnXSk7XG59KSkpO1xuIl19
|
|
@@ -19,8 +19,6 @@ const npm_1 = require("../../lib/npm");
|
|
|
19
19
|
// Same as https://github.com/DefinitelyTyped/DefinitelyTyped?tab=readme-ov-file#support-window
|
|
20
20
|
const TYPESCRIPT_VERSION_AGE_DAYS = 2 * 365;
|
|
21
21
|
const TYPESCRIPT_VERSIONS = (0, npm_1.typescriptVersionsYoungerThanDaysSync)(TYPESCRIPT_VERSION_AGE_DAYS, (0, npm_1.typescriptVersionsSync)());
|
|
22
|
-
// eslint-disable-next-line no-console
|
|
23
|
-
console.log(TYPESCRIPT_VERSIONS);
|
|
24
22
|
/**
|
|
25
23
|
* Test our generated code with various versions of TypeScript
|
|
26
24
|
*/
|
|
@@ -35,6 +33,8 @@ TYPESCRIPT_VERSIONS.forEach(tsVersion => {
|
|
|
35
33
|
// still want to test with older versions as well.
|
|
36
34
|
await removeDevDependencies(context);
|
|
37
35
|
await shell.shell(['npm', 'install', '--save-dev', `typescript@${tsVersion}`]);
|
|
36
|
+
// After we've removed devDependencies we need to re-install ts-node because it's necessary for `cdk synth`
|
|
37
|
+
await shell.shell(['npm', 'install', '--save-dev', 'ts-node@^10']);
|
|
38
38
|
await shell.shell(['npm', 'install']); // Older versions of npm require this to be a separate step from the one above
|
|
39
39
|
await shell.shell(['npx', 'tsc', '--version']);
|
|
40
40
|
await shell.shell(['npm', 'prune']);
|
|
@@ -51,4 +51,4 @@ async function removeDevDependencies(context) {
|
|
|
51
51
|
delete pj.devDependencies;
|
|
52
52
|
await fs_1.promises.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
|
|
53
53
|
}
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC10eXBlc2NyaXB0LWFwcC5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbml0LXR5cGVzY3JpcHQtYXBwLmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJCQUFvQztBQUNwQyw2QkFBNkI7QUFDN0IsbUNBQW9IO0FBQ3BILHVDQUE4RjtBQUU5RixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDdkMsSUFBQSxlQUFTLEVBQUMsbUJBQW1CLFFBQVEsRUFBRSxFQUFFLElBQUEsNEJBQXNCLEVBQUMsSUFBQSxrQkFBWSxFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUM3RixNQUFNLEtBQUssR0FBRyxpQkFBVyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMvQyxNQUFNLE9BQU8sQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUUxQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUVqRSxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNwQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLG9EQUFvRDtRQUN0RixNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDM0MsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBRTFDLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxP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MUIsTUFBTSxhQUFFLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztBQUN4RixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcHJvbWlzZXMgYXMgZnMgfSBmcm9tICdmcyc7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoVGVtcG9yYXJ5RGlyZWN0b3J5LCBTaGVsbEhlbHBlciwgd2l0aFBhY2thZ2VzLCBUZW1wb3JhcnlEaXJlY3RvcnlDb250ZXh0IH0gZnJvbSAnLi4vLi4vbGliJztcbmltcG9ydCB7IHR5cGVzY3JpcHRWZXJzaW9uc1N5bmMsIHR5cGVzY3JpcHRWZXJzaW9uc1lvdW5nZXJUaGFuRGF5c1N5bmMgfSBmcm9tICcuLi8uLi9saWIvbnBtJztcblxuWydhcHAnLCAnc2FtcGxlLWFwcCddLmZvckVhY2godGVtcGxhdGUgPT4ge1xuICBpbnRlZ1Rlc3QoYHR5cGVzY3JpcHQgaW5pdCAke3RlbXBsYXRlfWAsIHdpdGhUZW1wb3JhcnlEaXJlY3Rvcnkod2l0aFBhY2thZ2VzKGFzeW5jIChjb250ZXh0KSA9PiB7XG4gICAgY29uc3Qgc2hlbGwgPSBTaGVsbEhlbHBlci5mcm9tQ29udGV4dChjb250ZXh0KTtcbiAgICBhd2FpdCBjb250ZXh0LnBhY2thZ2VzLm1ha2VDbGlBdmFpbGFibGUoKTtcblxuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnY2RrJywgJ2luaXQnLCAnLWwnLCAndHlwZXNjcmlwdCcsIHRlbXBsYXRlXSk7XG5cbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ25wbScsICdwcnVuZSddKTtcbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ25wbScsICdscyddKTsgLy8gdGhpcyB3aWxsIGZhaWwgaWYgd2UgaGF2ZSB1bm1ldCBwZWVyIGRlcGVuZGVuY2llc1xuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnBtJywgJ3J1bicsICdidWlsZCddKTtcbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ25wbScsICdydW4nLCAndGVzdCddKTtcblxuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnY2RrJywgJ3N5bnRoJ10pO1xuICB9KSkpO1xufSk7XG5cbi8vIFNhbWUgYXMgaHR0cHM6Ly9naXRodWIuY29tL0RlZmluaXRlbHlUeXBlZC9EZWZpbml0ZWx5VHlwZWQ/dGFiPXJlYWRtZS1vdi1maWxlI3N1cHBvcnQtd2luZG93XG5jb25zdCBUWVBFU0NSSVBUX1ZFUlNJT05fQUdFX0RBWVMgPSAyICogMzY1O1xuXG5jb25zdCBUWVBFU0NSSVBUX1ZFUlNJT05TID0gdHlwZXNjcmlwdFZlcnNpb25zWW91bmdlclRoYW5EYXlzU3luYyhUWVBFU0NSSVBUX1ZFUlNJT05fQUdFX0RBWVMsIHR5cGVzY3JpcHRWZXJzaW9uc1N5bmMoKSk7XG5cbi8qKlxuICogVGVzdCBvdXIgZ2VuZXJhdGVkIGNvZGUgd2l0aCB2YXJpb3VzIHZlcnNpb25zIG9mIFR5cGVTY3JpcHRcbiAqL1xuVFlQRVNDUklQVF9WRVJTSU9OUy5mb3JFYWNoKHRzVmVyc2lvbiA9PiB7XG4gIGludGVnVGVzdChgdHlwZXNjcmlwdCAke3RzVmVyc2lvbn0gaW5pdCBhcHBgLCB3aXRoVGVtcG9yYXJ5RGlyZWN0b3J5KHdpdGhQYWNrYWdlcyhhc3luYyAoY29udGV4dCkgPT4ge1xuICAgIGNvbnN0IHNoZWxsID0gU2hlbGxIZWxwZXIuZnJvbUNvbnRleHQoY29udGV4dCk7XG4gICAgYXdhaXQgY29udGV4dC5wYWNrYWdlcy5tYWtlQ2xpQXZhaWxhYmxlKCk7XG5cbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ25vZGUnLCAnLS12ZXJzaW9uJ10pO1xuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnBtJywgJy0tdmVyc2lvbiddKTtcblxuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnY2RrJywgJ2luaXQnLCAnLWwnLCAndHlwZXNjcmlwdCcsICdhcHAnLCAnLS1nZW5lcmF0ZS1vbmx5J10pO1xuXG4gICAgLy8gTmVjZXNzYXJ5IGJlY2F1c2UgcmVjZW50IHZlcnNpb25zIG9mIHRzLWplc3QgcmVxdWlyZSBUeXBlU2NyaXB0Pj00LjMgYnV0IHdlXG4gICAgLy8gc3RpbGwgd2FudCB0byB0ZXN0IHdpdGggb2xkZXIgdmVyc2lvbnMgYXMgd2VsbC5cbiAgICBhd2FpdCByZW1vdmVEZXZEZXBlbmRlbmNpZXMoY29udGV4dCk7XG5cbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ25wbScsICdpbnN0YWxsJywgJy0tc2F2ZS1kZXYnLCBgdHlwZXNjcmlwdEAke3RzVmVyc2lvbn1gXSk7XG5cbiAgICAvLyBBZnRlciB3ZSd2ZSByZW1vdmVkIGRldkRlcGVuZGVuY2llcyB3ZSBuZWVkIHRvIHJlLWluc3RhbGwgdHMtbm9kZSBiZWNhdXNlIGl0J3MgbmVjZXNzYXJ5IGZvciBgY2RrIHN5bnRoYFxuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnBtJywgJ2luc3RhbGwnLCAnLS1zYXZlLWRldicsICd0cy1ub2RlQF4xMCddKTtcblxuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnBtJywgJ2luc3RhbGwnXSk7IC8vIE9sZGVyIHZlcnNpb25zIG9mIG5wbSByZXF1aXJlIHRoaXMgdG8gYmUgYSBzZXBhcmF0ZSBzdGVwIGZyb20gdGhlIG9uZSBhYm92ZVxuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnB4JywgJ3RzYycsICctLXZlcnNpb24nXSk7XG4gICAgYXdhaXQgc2hlbGwuc2hlbGwoWyducG0nLCAncHJ1bmUnXSk7XG4gICAgYXdhaXQgc2hlbGwuc2hlbGwoWyducG0nLCAnbHMnXSk7IC8vIHRoaXMgd2lsbCBmYWlsIGlmIHdlIGhhdmUgdW5tZXQgcGVlciBkZXBlbmRlbmNpZXNcblxuICAgIC8vIFdlIGp1c3QgcmVtb3ZlZCB0aGUgJ2plc3QnIGRlcGVuZGVuY3kgc28gcmVtb3ZlIHRoZSB0ZXN0cyBhcyB3ZWxsIGJlY2F1c2UgdGhleSB3b24ndCBjb21waWxlXG4gICAgYXdhaXQgc2hlbGwuc2hlbGwoWydybScsICctcmYnLCAndGVzdC8nXSk7XG5cbiAgICBhd2FpdCBzaGVsbC5zaGVsbChbJ25wbScsICdydW4nLCAnYnVpbGQnXSk7XG4gICAgYXdhaXQgc2hlbGwuc2hlbGwoWydjZGsnLCAnc3ludGgnXSk7XG4gIH0pKSk7XG59KTtcblxuYXN5bmMgZnVuY3Rpb24gcmVtb3ZlRGV2RGVwZW5kZW5jaWVzKGNvbnRleHQ6IFRlbXBvcmFyeURpcmVjdG9yeUNvbnRleHQpIHtcbiAgY29uc3QgZmlsZW5hbWUgPSBwYXRoLmpvaW4oY29udGV4dC5pbnRlZ1Rlc3REaXIsICdwYWNrYWdlLmpzb24nKTtcbiAgY29uc3QgcGogPSBKU09OLnBhcnNlKGF3YWl0IGZzLnJlYWRGaWxlKGZpbGVuYW1lLCB7IGVuY29kaW5nOiAndXRmLTgnIH0pKTtcbiAgZGVsZXRlIHBqLmRldkRlcGVuZGVuY2llcztcbiAgYXdhaXQgZnMud3JpdGVGaWxlKGZpbGVuYW1lLCBKU09OLnN0cmluZ2lmeShwaiwgdW5kZWZpbmVkLCAyKSwgeyBlbmNvZGluZzogJ3V0Zi04JyB9KTtcbn1cbiJdfQ==
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const lib_1 = require("../../lib");
|
|
4
4
|
jest.setTimeout(600000);
|
|
5
5
|
describe('uberpackage', () => {
|
|
6
|
-
(0, lib_1.integTest)('works with cloudformation-include', (0, lib_1.
|
|
6
|
+
(0, lib_1.integTest)('works with cloudformation-include', (0, lib_1.withSpecificFixture)('cfn-include-app', async (fixture) => {
|
|
7
7
|
fixture.log('Starting test of cfn-include with monolithic CDK');
|
|
8
8
|
await fixture.cdkSynth();
|
|
9
9
|
}));
|
|
10
10
|
});
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidWJlcnBhY2thZ2UuaW50ZWd0ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidWJlcnBhY2thZ2UuaW50ZWd0ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsbUNBQTJEO0FBRTNELElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTyxDQUFDLENBQUM7QUFFekIsUUFBUSxDQUFDLGFBQWEsRUFBRSxHQUFHLEVBQUU7SUFDM0IsSUFBQSxlQUFTLEVBQUMsbUNBQW1DLEVBQUUsSUFBQSx5QkFBbUIsRUFBQyxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7UUFDdEcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO1FBRWhFLE1BQU0sT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzNCLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDTixDQUFDLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGludGVnVGVzdCwgd2l0aFNwZWNpZmljRml4dHVyZSB9IGZyb20gJy4uLy4uL2xpYic7XG5cbmplc3Quc2V0VGltZW91dCg2MDBfMDAwKTtcblxuZGVzY3JpYmUoJ3ViZXJwYWNrYWdlJywgKCkgPT4ge1xuICBpbnRlZ1Rlc3QoJ3dvcmtzIHdpdGggY2xvdWRmb3JtYXRpb24taW5jbHVkZScsIHdpdGhTcGVjaWZpY0ZpeHR1cmUoJ2Nmbi1pbmNsdWRlLWFwcCcsIGFzeW5jIChmaXh0dXJlKSA9PiB7XG4gICAgZml4dHVyZS5sb2coJ1N0YXJ0aW5nIHRlc3Qgb2YgY2ZuLWluY2x1ZGUgd2l0aCBtb25vbGl0aGljIENESycpO1xuXG4gICAgYXdhaXQgZml4dHVyZS5jZGtTeW50aCgpO1xuICB9KSk7XG59KTtcbiJdfQ==
|