@aws-cdk-testing/cli-integ 3.4.0 → 3.4.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/lib/process.js +4 -4
- package/lib/process.ts +3 -3
- package/lib/shell.js +27 -13
- package/lib/shell.ts +30 -11
- package/lib/with-aws.js +2 -2
- package/lib/with-aws.ts +1 -1
- package/package.json +1 -1
- package/resources/integ.jest.config.js +1 -1
- package/tests/cli-integ-tests/cdk-import-interactive.integtest.js +8 -4
- package/tests/cli-integ-tests/cdk-import-interactive.integtest.ts +7 -3
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.js +2 -1
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts +2 -0
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.js +2 -1
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts +3 -0
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.js +2 -1
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts +2 -0
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.js +2 -1
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts +2 -0
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.js +2 -1
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts +2 -0
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.js +2 -1
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.ts +2 -0
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.js +2 -1
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.ts +2 -0
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.js +2 -1
- package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts +2 -0
package/lib/process.js
CHANGED
|
@@ -41,9 +41,9 @@ class PtyProcess {
|
|
|
41
41
|
onStdout(callback) {
|
|
42
42
|
this.process.onData((e) => callback(Buffer.from(e)));
|
|
43
43
|
}
|
|
44
|
-
onStderr(
|
|
45
|
-
//
|
|
46
|
-
|
|
44
|
+
onStderr(_callback) {
|
|
45
|
+
// https://github.com/microsoft/node-pty/issues/71
|
|
46
|
+
throw new Error(`Cannot register callback for 'stderr'. A tty does not have separate output and error channels`);
|
|
47
47
|
}
|
|
48
48
|
onExit(callback) {
|
|
49
49
|
this.process.onExit((e) => { callback(e.exitCode); });
|
|
@@ -94,4 +94,4 @@ class NonPtyProcess {
|
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
;
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"process.js","sourceRoot":"","sources":["process.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAEvC,gCAAgC;AAyC/B,CAAC;AAEF,MAAa,OAAO;IAElB;;OAEG;IACI,MAAM,CAAC,QAAQ,CAAC,OAAe,EAAE,IAAc,EAAE,UAA4D,EAAE;QAEpH,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;YACvC,IAAI,EAAE,aAAa;YACnB,GAAG,OAAO;SACX,CAAC,CAAA;QACF,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IAEjC,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,IAAc,EAAE,UAA8B,EAAE;QAEnF,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;YACzC,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,GAAG,OAAO;SACX,CAAC,CAAC;QACH,OAAO,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC;IAEpC,CAAC;CAEF;AA7BD,0BA6BC;AAED,MAAM,UAAU;IAEd,YAAoC,OAAiB;QAAjB,YAAO,GAAP,OAAO,CAAU;IAAG,CAAC;IAElD,QAAQ,CAAC,CAAU;QACxB,sDAAsD;IACxD,CAAC;IAEM,OAAO,CAAC,CAAyB;QACtC,kEAAkE;IACpE,CAAC;IAEM,QAAQ,CAAC,QAAiC;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAEM,QAAQ,CAAC,SAAkC;QAChD,kDAAkD;QAClD,MAAM,IAAI,KAAK,CAAC,+FAA+F,CAAC,CAAC;IACnH,CAAC;IAEM,MAAM,CAAC,QAAoC;QAChD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAGM,UAAU,CAAC,IAAY;QAC5B,oCAAoC;QACpC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;CAEF;AAAA,CAAC;AAEF,MAAM,aAAa;IAEjB,YAAoC,OAA2B;QAA3B,YAAO,GAAP,OAAO,CAAoB;IAAG,CAAC;IAE5D,OAAO,CAAC,QAAgC;QAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;IAEM,QAAQ,CAAC,QAAiC;QAC/C,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAEM,QAAQ,CAAC,QAAiC;QAC/C,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAEM,MAAM,CAAC,QAAoC;QAChD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;IAEM,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC5B,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAM,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,KAAM,CAAC,GAAG,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAEM,aAAa,CAAC,IAAmC,EAAE,MAA+C;QACvG,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,4BAA4B,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CAEF;AAAA,CAAC","sourcesContent":["import * as child from 'child_process';\nimport { Readable, Writable } from 'stream';\nimport * as pty from 'node-pty';\n\n/**\n * IProcess provides an interface to work with a subprocess.\n */\nexport interface IProcess {\n\n  /**\n   * Register a callback to be invoked when a chunk is written to stdout.\n   */\n  onStdout(callback: (chunk: Buffer) => void): void;\n\n  /**\n   * Register a callback to be invoked when a chunk is written to stderr.\n   */\n  onStderr(callback: (chunk: Buffer) => void): void;\n\n  /**\n   * Register a callback to be invoked when the process exists.\n   */\n  onExit(callback: (exitCode: number) => void): void;\n\n  /**\n   * Register a callback to be invoked if the process failed to start.\n   */\n  onError(callback: (error: Error) => void): void;\n\n  /**\n   * Write the process stdin stream.\n   */\n  writeStdin(data: string): void;\n\n  /**\n   * Singal that no more data will be written to stdin. In non tty process you must\n   * call this method to make sure the process exits.\n   *\n   * @param delay - optional delay in milliseconds before the signal is sent.\n   *\n   */\n  endStdin(delay?: number): void;\n\n};\n\nexport class Process {\n\n  /**\n   * Spawn a process with a TTY attached.\n   */\n  public static spawnTTY(command: string, args: string[], options: pty.IPtyForkOptions | pty.IWindowsPtyForkOptions = {}): IProcess {\n\n    const process = pty.spawn(command, args, {\n      name: 'xterm-color',\n      ...options,\n    })\n    return new PtyProcess(process);\n\n  }\n\n  /**\n   * Spawn a process without a forcing a TTY.\n   */\n  public static spawn(command: string, args: string[], options: child.SpawnOptions = {}): IProcess {\n\n    const process = child.spawn(command, args, {\n      shell: true,\n      stdio: ['ignore', 'pipe', 'pipe'],\n      ...options,\n    });\n    return new NonPtyProcess(process);\n\n  }\n\n}\n\nclass PtyProcess implements IProcess {\n\n  public constructor(private readonly process: pty.IPty) {}\n\n  public endStdin(_?: number): void {\n    // not needed because all streams are the same in tty.\n  }\n\n  public onError(_: (error: Error) => void): void {\n    // not needed because the pty.spawn will simply fail in this case.\n  }\n\n  public onStdout(callback: (chunk: Buffer) => void): void {\n    this.process.onData((e) => callback(Buffer.from(e)));\n  }\n\n  public onStderr(_callback: (chunk: Buffer) => void): void {\n    // https://github.com/microsoft/node-pty/issues/71\n    throw new Error(`Cannot register callback for 'stderr'. A tty does not have separate output and error channels`);\n  }\n\n  public onExit(callback: (exitCode: number) => void): void {\n    this.process.onExit((e) => { callback(e.exitCode) });\n  }\n\n\n  public writeStdin(data: string): void {\n    // in a pty all streams are the same\n    this.process.write(data)\n  }\n\n};\n\nclass NonPtyProcess implements IProcess {\n\n  public constructor(private readonly process: child.ChildProcess) {}\n\n  public onError(callback: (error: Error) => void): void {\n    this.process.once('error', callback);\n  }\n\n  public onStdout(callback: (chunk: Buffer) => void): void {\n    this.assertDefined('stdout', this.process.stdout);\n    this.process.stdout.on('data', callback);\n  }\n\n  public onStderr(callback: (chunk: Buffer) => void): void {\n    this.assertDefined('stderr', this.process.stderr);\n    this.process.stderr.on('data', callback);\n  }\n\n  public onExit(callback: (exitCode: number) => void): void {\n    this.process.on('close', callback);\n  }\n\n  public writeStdin(content: string): void {\n    this.assertDefined('stdin', this.process.stdin);\n    this.process.stdin.write(content);\n  }\n\n  public endStdin(delay?: number): void {\n    if (this.process.stdin == null) {\n      throw new Error('No stdin defined for process');\n    }\n    if (delay) {\n      setTimeout(() => this.process.stdin!.end(), delay);\n    } else {\n      this.process.stdin!.end();\n    }\n  }\n\n  public assertDefined(name: 'stdin' | 'stdout' | 'stderr', stream?: Readable | Writable | undefined | null): asserts stream {\n    if (stream == null) {\n      throw new Error(`No ${name} defined for child process`);\n    }\n  }\n\n};"]}
|
package/lib/process.ts
CHANGED
|
@@ -90,9 +90,9 @@ class PtyProcess implements IProcess {
|
|
|
90
90
|
this.process.onData((e) => callback(Buffer.from(e)));
|
|
91
91
|
}
|
|
92
92
|
|
|
93
|
-
public onStderr(
|
|
94
|
-
//
|
|
95
|
-
|
|
93
|
+
public onStderr(_callback: (chunk: Buffer) => void): void {
|
|
94
|
+
// https://github.com/microsoft/node-pty/issues/71
|
|
95
|
+
throw new Error(`Cannot register callback for 'stderr'. A tty does not have separate output and error channels`);
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
public onExit(callback: (exitCode: number) => void): void {
|
package/lib/shell.js
CHANGED
|
@@ -53,25 +53,36 @@ async function shell(command, options = {}) {
|
|
|
53
53
|
if (interaction) {
|
|
54
54
|
if (interaction.prompt.test(lastLine.get())) {
|
|
55
55
|
// subprocess expects a user input now.
|
|
56
|
-
//
|
|
57
|
-
|
|
56
|
+
// first, shift the interactions to ensure the same interaction is not reused
|
|
57
|
+
remainingInteractions.shift();
|
|
58
|
+
// then, reset the last line to prevent repeated matches caused by tty echoing
|
|
59
|
+
lastLine.reset();
|
|
60
|
+
// now write the input with a slight delay to ensure
|
|
61
|
+
// the child process has already started reading.
|
|
58
62
|
setTimeout(() => {
|
|
59
63
|
var _a;
|
|
60
64
|
child.writeStdin(interaction.input + ((_a = interaction.end) !== null && _a !== void 0 ? _a : os.EOL));
|
|
61
|
-
remainingInteractions.shift();
|
|
62
65
|
}, 500);
|
|
63
66
|
}
|
|
64
67
|
}
|
|
65
68
|
});
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
69
|
+
if (tty && options.captureStderr === false) {
|
|
70
|
+
// in a tty stderr goes to the same fd as stdout
|
|
71
|
+
throw new Error(`Cannot disable 'captureStderr' in tty`);
|
|
72
|
+
}
|
|
73
|
+
if (!tty) {
|
|
74
|
+
// in a tty stderr goes to the same fd as stdout, so onStdout
|
|
75
|
+
// is sufficient.
|
|
76
|
+
child.onStderr(chunk => {
|
|
77
|
+
var _a;
|
|
78
|
+
if (show === 'always') {
|
|
79
|
+
writeToOutputs(chunk.toString('utf-8'));
|
|
80
|
+
}
|
|
81
|
+
if ((_a = options.captureStderr) !== null && _a !== void 0 ? _a : true) {
|
|
82
|
+
stderr.push(chunk);
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}
|
|
75
86
|
child.onError(reject);
|
|
76
87
|
child.onExit(code => {
|
|
77
88
|
const stderrOutput = Buffer.concat(stderr).toString('utf-8');
|
|
@@ -198,5 +209,8 @@ class LastLine {
|
|
|
198
209
|
get() {
|
|
199
210
|
return this.lastLine;
|
|
200
211
|
}
|
|
212
|
+
reset() {
|
|
213
|
+
this.lastLine = '';
|
|
214
|
+
}
|
|
201
215
|
}
|
|
202
|
-
//# 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 os from 'os';\nimport * as path from 'path';\nimport { TestContext } from './integ-test';\nimport { Process } from './process';\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  const env = options.env ?? (options.modEnv ? { ...process.env, ...options.modEnv } : process.env);\n  const tty = options.interact && options.interact.length > 0;\n\n  // Coerce to `any` because `ShellOptions` contains custom properties\n  // that don't exist in the underlying interfaces. We could either rebuild each options map,\n  // or just pass through and let the underlying implemenation ignore what it doesn't know about.\n  // We choose the lazy one.\n  const spawnOptions = { ...options, env } as any;\n\n  const child = tty\n    ? Process.spawnTTY(command[0], command.slice(1), spawnOptions)\n    : Process.spawn(command[0], command.slice(1), spawnOptions)\n\n  // copy because we will be shifting it\n  const remainingInteractions = [...(options.interact ?? [])];\n\n  return new Promise<string>((resolve, reject) => {\n    const stdout = new Array<Buffer>();\n    const stderr = new Array<Buffer>();\n\n    const lastLine = new LastLine();\n\n    child.onStdout(chunk => {\n      if (show === 'always') {\n        writeToOutputs(chunk.toString('utf-8'));\n      }\n      stdout.push(chunk);\n      lastLine.append(chunk.toString('utf-8'));\n\n      const interaction = remainingInteractions[0];\n      if (interaction) {\n\n        if (interaction.prompt.test(lastLine.get())) {\n          // subprocess expects a user input now.\n          // we have to write the input AFTER the child has started\n          // reading, so we do this with a small delay.\n          setTimeout(() => {\n            child.writeStdin(interaction.input + (interaction.end ?? os.EOL));\n            remainingInteractions.shift();\n          }, 500);\n        }\n\n      }\n\n    });\n\n    child.onStderr(chunk => {\n      if (show === 'always') {\n        writeToOutputs(chunk.toString('utf-8'));\n      }\n      if (options.captureStderr ?? true) {\n        stderr.push(chunk);\n      }\n    });\n\n    child.onError(reject);\n\n    child.onExit(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\n      const logAndreject = (error: Error) => {\n        if (show === 'error') {\n          writeToOutputs(`${out}\\n`);\n        }\n        reject(error);\n      }\n\n      if (remainingInteractions.length !== 0) {\n        // regardless of the exit code, if we didn't consume all expected interactions we probably\n        // did somethiing wrong.\n        logAndreject(new Error(`Expected more user interactions but subprocess exited with ${code}`));\n        return;\n      }\n\n      if (code === 0 || options.allowErrExit) {\n        resolve(out);\n      } else {\n        logAndreject(new Error(`'${command.join(' ')}' exited with error code ${code}.`));\n      }\n    });\n  });\n}\n\n/**\n * Models a single user interaction with the shell.\n */\nexport interface UserInteraction {\n  /**\n   * The prompt to expect. Regex matched against the last line in\n   * the output before the prompt is displayed.\n   *\n   * Most commonly this would be a simple string to match for inclusion.\n   *\n   * Examples:\n   *\n   * - Process Output: \"Hey there! Are you sure?\"\n   *   Prompt: /Are you sure?/\n   *   Match (Yes/No): Yes\n   *   Reason: \"Hey there! Are you sure?\" ~ /Are you sure?/\n   *\n   * - Process Output: \"Hey there!\\nAre you sure?\"\n   *   Prompt: /Are you sure?/\n   *   Match (Yes/No): Yes\n   *   Reason: \"Are you sure?\" ~ /Are you sure?/\n   *\n   * - Process Output: \"Are you sure?\\n(remember this is destructive)\"\n   *   Prompt: /Are you sure?/\n   *   Match (Yes/No): No\n   *   Reason: \"(remember this is destructive)\" ≄ /Are you sure?/\n   *\n   * - Process Output: \"Are you sure?\\n(remember this is destructive)\"\n   *   Prompt: /remember this is destructive/\n   *   Match (Yes/No): Yes\n   *   Reason: \"(remember this is destructive)\" ~ /remember this is destructive/\n   *\n   */\n  readonly prompt: RegExp;\n  /**\n   * The input to provide.\n   */\n  readonly input: string;\n\n  /**\n   * The string to signal the end of input.\n   *\n   * @default os.EOL\n   */\n  readonly end?: string;\n}\n\nexport interface ShellOptions extends child_process.SpawnOptions {\n  /**\n   * Properties to add to 'env'\n   */\n  readonly modEnv?: Record<string, string | undefined>;\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  /**\n   * Provide user interaction to respond to shell prompts.\n   *\n   * Order and count should correspond to the expected prompts issued by the subprocess.\n   */\n  readonly interact?: UserInteraction[];\n\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      modEnv: {\n        // give every shell its own docker config directory\n        // so that parallel runs don't interfere with each other.\n        DOCKER_CONFIG: path.join(this._cwd, '.docker'),\n        ...options.modEnv,\n      },\n    });\n  }\n}\n\n/**\n * rm -rf reimplementation, don't want to depend on an NPM package for this\n *\n * Returns `true` if everything got deleted, or `false` if some files could\n * not be deleted due to permissions issues.\n */\nexport function rimraf(fsPath: string): boolean {\n  try {\n    let success = true;\n    const isDir = fs.lstatSync(fsPath).isDirectory();\n\n    if (isDir) {\n      for (const file of fs.readdirSync(fsPath)) {\n        success &&= rimraf(path.join(fsPath, file));\n      }\n      fs.rmdirSync(fsPath);\n    } else {\n      fs.unlinkSync(fsPath);\n    }\n    return success;\n  } catch (e: any) {\n    // Can happen if some files got generated inside a Docker container and are now inadvertently owned by `root`.\n    // We can't ever clean those up anymore, but since it only happens inside GitHub Actions containers we also don't care too much.\n    if (e.code === 'EACCES' || e.code === 'ENOTEMPTY') { return false; }\n\n    // Already gone\n    if (e.code === 'ENOENT') { return true; }\n\n    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\n/**\n * Accumulate text since the last line break (or beginning of string) it has seen in the chunks.\n *\n * Examples:\n *\n * - Chunks: ['one\\n', 'two\\n', three']\n * - Last Line: 'three'\n *\n * - Chunks: ['one', 'two', '\\nthree']\n * - Last Line: 'three'\n *\n * - Chunks: ['one', 'two']\n * - Last Line: 'onetwo'\n *\n * - Chunks: ['one', 'two', '\\nthree', 'four']\n * - Last Line: 'threefour'\n */\nclass LastLine {\n\n  private lastLine: string = '';\n\n  public append(chunk: string): void {\n    const lines = chunk.split(os.EOL);\n    if (lines.length === 1) {\n      // chunk doesn't contain a new line so just append\n      this.lastLine += lines[0];\n    } else {\n      // chunk contains multiple lines so just override with the last one\n      this.lastLine = lines[lines.length - 1];\n    }\n  }\n\n  public get(): string {\n    return this.lastLine;\n  }\n}"]}
|
|
216
|
+
//# 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 os from 'os';\nimport * as path from 'path';\nimport { TestContext } from './integ-test';\nimport { Process } from './process';\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  const env = options.env ?? (options.modEnv ? { ...process.env, ...options.modEnv } : process.env);\n  const tty = options.interact && options.interact.length > 0;\n\n  // Coerce to `any` because `ShellOptions` contains custom properties\n  // that don't exist in the underlying interfaces. We could either rebuild each options map,\n  // or just pass through and let the underlying implemenation ignore what it doesn't know about.\n  // We choose the lazy one.\n  const spawnOptions = { ...options, env } as any;\n\n  const child = tty\n    ? Process.spawnTTY(command[0], command.slice(1), spawnOptions)\n    : Process.spawn(command[0], command.slice(1), spawnOptions)\n\n  // copy because we will be shifting it\n  const remainingInteractions = [...(options.interact ?? [])];\n\n  return new Promise<string>((resolve, reject) => {\n    const stdout = new Array<Buffer>();\n    const stderr = new Array<Buffer>();\n\n    const lastLine = new LastLine();\n\n    child.onStdout(chunk => {\n      if (show === 'always') {\n        writeToOutputs(chunk.toString('utf-8'));\n      }\n      stdout.push(chunk);\n      lastLine.append(chunk.toString('utf-8'));\n\n      const interaction = remainingInteractions[0];\n      if (interaction) {\n\n        if (interaction.prompt.test(lastLine.get())) {\n\n          // subprocess expects a user input now.\n          // first, shift the interactions to ensure the same interaction is not reused\n          remainingInteractions.shift();\n\n          // then, reset the last line to prevent repeated matches caused by tty echoing\n          lastLine.reset();\n\n          // now write the input with a slight delay to ensure\n          // the child process has already started reading.\n          setTimeout(() => {\n            child.writeStdin(interaction.input + (interaction.end ?? os.EOL));\n          }, 500);\n        }\n\n      }\n\n    });\n\n    if (tty && options.captureStderr === false) {\n      // in a tty stderr goes to the same fd as stdout\n      throw new Error(`Cannot disable 'captureStderr' in tty`);\n    }\n\n    if (!tty) {\n      // in a tty stderr goes to the same fd as stdout, so onStdout\n      // is sufficient.\n      child.onStderr(chunk => {\n        if (show === 'always') {\n          writeToOutputs(chunk.toString('utf-8'));\n        }\n        if (options.captureStderr ?? true) {\n          stderr.push(chunk);\n        }\n      });\n    }\n\n    child.onError(reject);\n\n    child.onExit(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\n      const logAndreject = (error: Error) => {\n        if (show === 'error') {\n          writeToOutputs(`${out}\\n`);\n        }\n        reject(error);\n      }\n\n      if (remainingInteractions.length !== 0) {\n        // regardless of the exit code, if we didn't consume all expected interactions we probably\n        // did somethiing wrong.\n        logAndreject(new Error(`Expected more user interactions but subprocess exited with ${code}`));\n        return;\n      }\n\n      if (code === 0 || options.allowErrExit) {\n        resolve(out);\n      } else {\n        logAndreject(new Error(`'${command.join(' ')}' exited with error code ${code}.`));\n      }\n    });\n  });\n}\n\n/**\n * Models a single user interaction with the shell.\n */\nexport interface UserInteraction {\n  /**\n   * The prompt to expect. Regex matched against the last line in\n   * the output before the prompt is displayed.\n   *\n   * Most commonly this would be a simple string to match for inclusion.\n   *\n   * Examples:\n   *\n   * - Process Output: \"Hey there! Are you sure?\"\n   *   Prompt: /Are you sure?/\n   *   Match (Yes/No): Yes\n   *   Reason: \"Hey there! Are you sure?\" ~ /Are you sure?/\n   *\n   * - Process Output: \"Hey there!\\nAre you sure?\"\n   *   Prompt: /Are you sure?/\n   *   Match (Yes/No): Yes\n   *   Reason: \"Are you sure?\" ~ /Are you sure?/\n   *\n   * - Process Output: \"Are you sure?\\n(remember this is destructive)\"\n   *   Prompt: /Are you sure?/\n   *   Match (Yes/No): No\n   *   Reason: \"(remember this is destructive)\" ≄ /Are you sure?/\n   *\n   * - Process Output: \"Are you sure?\\n(remember this is destructive)\"\n   *   Prompt: /remember this is destructive/\n   *   Match (Yes/No): Yes\n   *   Reason: \"(remember this is destructive)\" ~ /remember this is destructive/\n   *\n   */\n  readonly prompt: RegExp;\n  /**\n   * The input to provide.\n   */\n  readonly input: string;\n\n  /**\n   * The string to signal the end of input.\n   *\n   * @default os.EOL\n   */\n  readonly end?: string;\n}\n\nexport interface ShellOptions extends child_process.SpawnOptions {\n  /**\n   * Properties to add to 'env'\n   */\n  readonly modEnv?: Record<string, string | undefined>;\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  /**\n   * Provide user interaction to respond to shell prompts.\n   *\n   * Order and count should correspond to the expected prompts issued by the subprocess.\n   */\n  readonly interact?: UserInteraction[];\n\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      modEnv: {\n        // give every shell its own docker config directory\n        // so that parallel runs don't interfere with each other.\n        DOCKER_CONFIG: path.join(this._cwd, '.docker'),\n        ...options.modEnv,\n      },\n    });\n  }\n}\n\n/**\n * rm -rf reimplementation, don't want to depend on an NPM package for this\n *\n * Returns `true` if everything got deleted, or `false` if some files could\n * not be deleted due to permissions issues.\n */\nexport function rimraf(fsPath: string): boolean {\n  try {\n    let success = true;\n    const isDir = fs.lstatSync(fsPath).isDirectory();\n\n    if (isDir) {\n      for (const file of fs.readdirSync(fsPath)) {\n        success &&= rimraf(path.join(fsPath, file));\n      }\n      fs.rmdirSync(fsPath);\n    } else {\n      fs.unlinkSync(fsPath);\n    }\n    return success;\n  } catch (e: any) {\n    // Can happen if some files got generated inside a Docker container and are now inadvertently owned by `root`.\n    // We can't ever clean those up anymore, but since it only happens inside GitHub Actions containers we also don't care too much.\n    if (e.code === 'EACCES' || e.code === 'ENOTEMPTY') { return false; }\n\n    // Already gone\n    if (e.code === 'ENOENT') { return true; }\n\n    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\n/**\n * Accumulate text since the last line break (or beginning of string) it has seen in the chunks.\n *\n * Examples:\n *\n * - Chunks: ['one\\n', 'two\\n', three']\n * - Last Line: 'three'\n *\n * - Chunks: ['one', 'two', '\\nthree']\n * - Last Line: 'three'\n *\n * - Chunks: ['one', 'two']\n * - Last Line: 'onetwo'\n *\n * - Chunks: ['one', 'two', '\\nthree', 'four']\n * - Last Line: 'threefour'\n */\nclass LastLine {\n\n  private lastLine: string = '';\n\n  public append(chunk: string): void {\n    const lines = chunk.split(os.EOL);\n    if (lines.length === 1) {\n      // chunk doesn't contain a new line so just append\n      this.lastLine += lines[0];\n    } else {\n      // chunk contains multiple lines so just override with the last one\n      this.lastLine = lines[lines.length - 1];\n    }\n  }\n\n  public get(): string {\n    return this.lastLine;\n  }\n\n  public reset() {\n    this.lastLine = '';\n  }\n}"]}
|
package/lib/shell.ts
CHANGED
|
@@ -60,12 +60,18 @@ export async function shell(command: string[], options: ShellOptions = {}): Prom
|
|
|
60
60
|
if (interaction) {
|
|
61
61
|
|
|
62
62
|
if (interaction.prompt.test(lastLine.get())) {
|
|
63
|
+
|
|
63
64
|
// subprocess expects a user input now.
|
|
64
|
-
//
|
|
65
|
-
|
|
65
|
+
// first, shift the interactions to ensure the same interaction is not reused
|
|
66
|
+
remainingInteractions.shift();
|
|
67
|
+
|
|
68
|
+
// then, reset the last line to prevent repeated matches caused by tty echoing
|
|
69
|
+
lastLine.reset();
|
|
70
|
+
|
|
71
|
+
// now write the input with a slight delay to ensure
|
|
72
|
+
// the child process has already started reading.
|
|
66
73
|
setTimeout(() => {
|
|
67
74
|
child.writeStdin(interaction.input + (interaction.end ?? os.EOL));
|
|
68
|
-
remainingInteractions.shift();
|
|
69
75
|
}, 500);
|
|
70
76
|
}
|
|
71
77
|
|
|
@@ -73,14 +79,23 @@ export async function shell(command: string[], options: ShellOptions = {}): Prom
|
|
|
73
79
|
|
|
74
80
|
});
|
|
75
81
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
82
|
+
if (tty && options.captureStderr === false) {
|
|
83
|
+
// in a tty stderr goes to the same fd as stdout
|
|
84
|
+
throw new Error(`Cannot disable 'captureStderr' in tty`);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (!tty) {
|
|
88
|
+
// in a tty stderr goes to the same fd as stdout, so onStdout
|
|
89
|
+
// is sufficient.
|
|
90
|
+
child.onStderr(chunk => {
|
|
91
|
+
if (show === 'always') {
|
|
92
|
+
writeToOutputs(chunk.toString('utf-8'));
|
|
93
|
+
}
|
|
94
|
+
if (options.captureStderr ?? true) {
|
|
95
|
+
stderr.push(chunk);
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
}
|
|
84
99
|
|
|
85
100
|
child.onError(reject);
|
|
86
101
|
|
|
@@ -309,4 +324,8 @@ class LastLine {
|
|
|
309
324
|
public get(): string {
|
|
310
325
|
return this.lastLine;
|
|
311
326
|
}
|
|
327
|
+
|
|
328
|
+
public reset() {
|
|
329
|
+
this.lastLine = '';
|
|
330
|
+
}
|
|
312
331
|
}
|
package/lib/with-aws.js
CHANGED
|
@@ -35,7 +35,7 @@ function withAws(block, disableBootstrap = false) {
|
|
|
35
35
|
return async (context) => {
|
|
36
36
|
if (atmosphereEnabled()) {
|
|
37
37
|
const atmosphere = new cdk_atmosphere_client_1.AtmosphereClient(atmosphereEndpoint());
|
|
38
|
-
const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name });
|
|
38
|
+
const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name, timeoutSeconds: 60 * 30 });
|
|
39
39
|
const aws = await aws_1.AwsClients.forIdentity(allocation.environment.region, {
|
|
40
40
|
accessKeyId: allocation.credentials.accessKeyId,
|
|
41
41
|
secretAccessKey: allocation.credentials.secretAccessKey,
|
|
@@ -103,4 +103,4 @@ async function sanityCheck(aws) {
|
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
let sanityChecked;
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# 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, timeoutSeconds: 60 * 30 });\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  _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
|
@@ -39,7 +39,7 @@ export function withAws<A extends TestContext>(
|
|
|
39
39
|
return async (context: A) => {
|
|
40
40
|
if (atmosphereEnabled()) {
|
|
41
41
|
const atmosphere = new AtmosphereClient(atmosphereEndpoint());
|
|
42
|
-
const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name });
|
|
42
|
+
const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name, timeoutSeconds: 60 * 30 });
|
|
43
43
|
const aws = await AwsClients.forIdentity(allocation.environment.region, {
|
|
44
44
|
accessKeyId: allocation.credentials.accessKeyId,
|
|
45
45
|
secretAccessKey: allocation.credentials.secretAccessKey,
|
package/package.json
CHANGED
|
@@ -17,7 +17,7 @@ module.exports = {
|
|
|
17
17
|
|
|
18
18
|
// Because of the way Jest concurrency works, this timeout includes waiting
|
|
19
19
|
// for the lock. Which is almost never what we actually care about. Set it high.
|
|
20
|
-
testTimeout:
|
|
20
|
+
testTimeout: 2 * 60 * 60_000,
|
|
21
21
|
|
|
22
22
|
maxWorkers: 50,
|
|
23
23
|
reporters: [
|
|
@@ -22,14 +22,18 @@ const lib_1 = require("../../lib");
|
|
|
22
22
|
await fixture.cdk(['import', fullStackName], {
|
|
23
23
|
interact: [
|
|
24
24
|
{
|
|
25
|
-
prompt:
|
|
25
|
+
prompt: /Topic1.*\(empty to skip\):/,
|
|
26
26
|
input: topic1Arn,
|
|
27
27
|
},
|
|
28
28
|
{
|
|
29
|
-
prompt:
|
|
29
|
+
prompt: /Topic2.*\(empty to skip\):/,
|
|
30
30
|
input: topic2Arn,
|
|
31
31
|
}
|
|
32
|
-
]
|
|
32
|
+
],
|
|
33
|
+
modEnv: {
|
|
34
|
+
// disable coloring because it messes up prompt matching.
|
|
35
|
+
FORCE_COLOR: '0'
|
|
36
|
+
}
|
|
33
37
|
});
|
|
34
38
|
// assert the stack now has the two topics
|
|
35
39
|
const stackResources = await fixture.aws.cloudFormation.send(new client_cloudformation_1.DescribeStackResourcesCommand({ StackName: fullStackName }));
|
|
@@ -43,4 +47,4 @@ const lib_1 = require("../../lib");
|
|
|
43
47
|
await fixture.aws.sns.send(new client_sns_1.DeleteTopicCommand({ TopicArn: topic2Arn }));
|
|
44
48
|
}
|
|
45
49
|
}));
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLWltcG9ydC1pbnRlcmFjdGl2ZS5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjZGstaW1wb3J0LWludGVyYWN0aXZlLmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBFQUErRTtBQUMvRSxvREFBNkU7QUFDN0UsbUNBQTBEO0FBRTFELElBQUEsZUFBUyxFQUFDLGdEQUFnRCxFQUFFLElBQUEsd0JBQWtCLEVBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFOztJQUUvRixNQUFNLFNBQVMsR0FBRyxDQUFDLFNBQWlCLEVBQUUsRUFBRSxDQUFDLEdBQUcsU0FBUyxJQUFJLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUNoRixNQUFNLFFBQVEsR0FBRyxLQUFLLEVBQUUsSUFBWSxFQUFFLEVBQUUsQ0FBQyxlQUFlLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxJQUFLLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUVwSCxNQUFNLFVBQVUsR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdkMsTUFBTSxVQUFVLEdBQUcsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBRXZDLE1BQU0sU0FBUyxHQUFHLE1BQU0sUUFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQzdDLE1BQU0sU0FBUyxHQUFHLE1BQU0sUUFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRTdDLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDNUMsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSwrQkFBa0IsQ0FBQyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFDeEUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUM1QyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLCtCQUFrQixDQUFDLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUV4RSxJQUFJLENBQUM7UUFFSCxNQUFNLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQztRQUNuQyxNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRXZELE9BQU8sQ0FBQyxHQUFHLENBQUMsNkJBQTZCLGFBQWEsRUFBRSxDQUFDLENBQUM7UUFDMUQsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLGFBQWEsQ0FBQyxFQUFFO1lBQzNDLFFBQVEsRUFBRTtnQkFDUjtvQkFDRSxNQUFNLEVBQUUsNEJBQTRCO29CQUNwQyxLQUFLLEVBQUUsU0FBUztpQkFDakI7Z0JBQ0Q7b0JBQ0UsTUFBTSxFQUFFLDRCQUE0QjtvQkFDcEMsS0FBSyxFQUFFLFNBQVM7aUJBQ2pCO2FBQ0Y7WUFDRCxNQUFNLEVBQUU7Z0JBQ04seURBQXlEO2dCQUN6RCxXQUFXLEVBQUUsR0FBRzthQUNqQjtTQUNGLENBQUMsQ0FBQztRQUVILDBDQUEwQztRQUMxQyxNQUFNLGNBQWMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxJQUFJLHFEQUE2QixDQUFDLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM3SCxNQUFNLGNBQWMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxNQUFBLE1BQUEsY0FBYyxDQUFDLGNBQWMsMENBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFlBQVksS0FBSyxpQkFBaUIsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsbUNBQUksRUFBRSxDQUFDLENBQUM7UUFFdEosTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFFakUsQ0FBQztZQUFTLENBQUM7UUFDVCxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixVQUFVLEVBQUUsQ0FBQyxDQUFDO1FBQzVDLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksK0JBQWtCLENBQUMsRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzNFLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLFVBQVUsRUFBRSxDQUFDLENBQUM7UUFDNUMsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSwrQkFBa0IsQ0FBQyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFDN0UsQ0FBQztBQUVILENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEZXNjcmliZVN0YWNrUmVzb3VyY2VzQ29tbWFuZCB9IGZyb20gJ0Bhd3Mtc2RrL2NsaWVudC1jbG91ZGZvcm1hdGlvbic7XG5pbXBvcnQgeyBDcmVhdGVUb3BpY0NvbW1hbmQsIERlbGV0ZVRvcGljQ29tbWFuZCB9IGZyb20gJ0Bhd3Mtc2RrL2NsaWVudC1zbnMnO1xuaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoRGVmYXVsdEZpeHR1cmUgfSBmcm9tICcuLi8uLi9saWInO1xuXG5pbnRlZ1Rlc3QoJ2NkayBpbXBvcnQgcHJvbXB0cyB0aGUgdXNlciBmb3Igc25zIHRvcGljIGFybnMnLCB3aXRoRGVmYXVsdEZpeHR1cmUoYXN5bmMgKGZpeHR1cmUpID0+IHtcblxuICBjb25zdCB0b3BpY05hbWUgPSAobG9naWNhbElkOiBzdHJpbmcpID0+IGAke2xvZ2ljYWxJZH0tJHtmaXh0dXJlLnJhbmRvbVN0cmluZ31gO1xuICBjb25zdCB0b3BpY0FybiA9IGFzeW5jIChuYW1lOiBzdHJpbmcpID0+IGBhcm46YXdzOnNuczoke2ZpeHR1cmUuYXdzLnJlZ2lvbn06JHsgYXdhaXQgZml4dHVyZS5hd3MuYWNjb3VudCgpfToke25hbWV9YFxuXG4gIGNvbnN0IHRvcGljMU5hbWUgPSB0b3BpY05hbWUoJ1RvcGljMScpO1xuICBjb25zdCB0b3BpYzJOYW1lID0gdG9waWNOYW1lKCdUb3BpYzInKTtcblxuICBjb25zdCB0b3BpYzFBcm4gPSBhd2FpdCB0b3BpY0Fybih0b3BpYzFOYW1lKTtcbiAgY29uc3QgdG9waWMyQXJuID0gYXdhaXQgdG9waWNBcm4odG9waWMyTmFtZSk7XG5cbiAgZml4dHVyZS5sb2coYENyZWF0aW5nIHRvcGljICR7dG9waWMxTmFtZX1gKTtcbiAgYXdhaXQgZml4dHVyZS5hd3Muc25zLnNlbmQobmV3IENyZWF0ZVRvcGljQ29tbWFuZCh7IE5hbWU6IHRvcGljMU5hbWUgfSkpXG4gIGZpeHR1cmUubG9nKGBDcmVhdGluZyB0b3BpYyAke3RvcGljMk5hbWV9YCk7XG4gIGF3YWl0IGZpeHR1cmUuYXdzLnNucy5zZW5kKG5ldyBDcmVhdGVUb3BpY0NvbW1hbmQoeyBOYW1lOiB0b3BpYzJOYW1lIH0pKVxuXG4gIHRyeSB7XG5cbiAgICBjb25zdCBzdGFja05hbWUgPSAndHdvLXNucy10b3BpY3MnO1xuICAgIGNvbnN0IGZ1bGxTdGFja05hbWUgPSBmaXh0dXJlLmZ1bGxTdGFja05hbWUoc3RhY2tOYW1lKTtcblxuICAgIGZpeHR1cmUubG9nKGBJbXBvcnRpbmcgdG9waWNzIHRvIHN0YWNrICR7ZnVsbFN0YWNrTmFtZX1gKTtcbiAgICBhd2FpdCBmaXh0dXJlLmNkayhbJ2ltcG9ydCcsIGZ1bGxTdGFja05hbWVdLCB7XG4gICAgICBpbnRlcmFjdDogW1xuICAgICAgICB7XG4gICAgICAgICAgcHJvbXB0OiAvVG9waWMxLipcXChlbXB0eSB0byBza2lwXFwpOi8sXG4gICAgICAgICAgaW5wdXQ6IHRvcGljMUFybixcbiAgICAgICAgfSxcbiAgICAgICAge1xuICAgICAgICAgIHByb21wdDogL1RvcGljMi4qXFwoZW1wdHkgdG8gc2tpcFxcKTovLFxuICAgICAgICAgIGlucHV0OiB0b3BpYzJBcm4sXG4gICAgICAgIH1cbiAgICAgIF0sXG4gICAgICBtb2RFbnY6IHtcbiAgICAgICAgLy8gZGlzYWJsZSBjb2xvcmluZyBiZWNhdXNlIGl0IG1lc3NlcyB1cCBwcm9tcHQgbWF0Y2hpbmcuXG4gICAgICAgIEZPUkNFX0NPTE9SOiAnMCdcbiAgICAgIH1cbiAgICB9KTtcblxuICAgIC8vIGFzc2VydCB0aGUgc3RhY2sgbm93IGhhcyB0aGUgdHdvIHRvcGljc1xuICAgIGNvbnN0IHN0YWNrUmVzb3VyY2VzID0gYXdhaXQgZml4dHVyZS5hd3MuY2xvdWRGb3JtYXRpb24uc2VuZChuZXcgRGVzY3JpYmVTdGFja1Jlc291cmNlc0NvbW1hbmQoeyBTdGFja05hbWU6IGZ1bGxTdGFja05hbWUgfSkpXG4gICAgY29uc3Qgc3RhY2tUb3BpY0FybnMgPSBuZXcgU2V0KHN0YWNrUmVzb3VyY2VzLlN0YWNrUmVzb3VyY2VzPy5maWx0ZXIociA9PiByLlJlc291cmNlVHlwZSA9PT0gJ0FXUzo6U05TOjpUb3BpYycpLm1hcChyID0+IHIuUGh5c2ljYWxSZXNvdXJjZUlkKSA/PyBbXSk7XG5cbiAgICBleHBlY3Qoc3RhY2tUb3BpY0FybnMpLnRvRXF1YWwobmV3IFNldChbdG9waWMxQXJuLCB0b3BpYzJBcm5dKSlcblxuICB9IGZpbmFsbHkge1xuICAgIGZpeHR1cmUubG9nKGBEZWxldGluZyB0b3BpYyAke3RvcGljMU5hbWV9YCk7XG4gICAgYXdhaXQgZml4dHVyZS5hd3Muc25zLnNlbmQobmV3IERlbGV0ZVRvcGljQ29tbWFuZCh7IFRvcGljQXJuOiB0b3BpYzFBcm4gfSkpXG4gICAgZml4dHVyZS5sb2coYERlbGV0aW5nIHRvcGljICR7dG9waWMyTmFtZX1gKTtcbiAgICBhd2FpdCBmaXh0dXJlLmF3cy5zbnMuc2VuZChuZXcgRGVsZXRlVG9waWNDb21tYW5kKHsgVG9waWNBcm46IHRvcGljMkFybiB9KSlcbiAgfVxuXG59KSk7Il19
|
|
@@ -27,14 +27,18 @@ integTest('cdk import prompts the user for sns topic arns', withDefaultFixture(a
|
|
|
27
27
|
await fixture.cdk(['import', fullStackName], {
|
|
28
28
|
interact: [
|
|
29
29
|
{
|
|
30
|
-
prompt:
|
|
30
|
+
prompt: /Topic1.*\(empty to skip\):/,
|
|
31
31
|
input: topic1Arn,
|
|
32
32
|
},
|
|
33
33
|
{
|
|
34
|
-
prompt:
|
|
34
|
+
prompt: /Topic2.*\(empty to skip\):/,
|
|
35
35
|
input: topic2Arn,
|
|
36
36
|
}
|
|
37
|
-
]
|
|
37
|
+
],
|
|
38
|
+
modEnv: {
|
|
39
|
+
// disable coloring because it messes up prompt matching.
|
|
40
|
+
FORCE_COLOR: '0'
|
|
41
|
+
}
|
|
38
42
|
});
|
|
39
43
|
|
|
40
44
|
// assert the stack now has the two topics
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const testcase_1 = require("./testcase");
|
|
4
4
|
const lib_1 = require("../../../lib");
|
|
5
5
|
const language = 'csharp';
|
|
6
|
+
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
6
7
|
(0, lib_1.integTest)(`cdk migrate --from-stack creates deployable ${language} app`, (0, lib_1.withExtendedTimeoutFixture)(async (fixture) => {
|
|
7
8
|
await (0, testcase_1.fromStackCreatesDeployableApp)(fixture, language);
|
|
8
9
|
}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1pZ3JhdGUtLWZyb20tc3RhY2stY3JlYXRlcy1kZXBsb3lhYmxlLWFwcC1jc2hhcnAuaW50ZWd0ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY2RrLW1pZ3JhdGUtLWZyb20tc3RhY2stY3JlYXRlcy1kZXBsb3lhYmxlLWFwcC1jc2hhcnAuaW50ZWd0ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQTJEO0FBQzNELHNDQUFxRTtBQUVyRSxNQUFNLFFBQVEsR0FBRyxRQUFRLENBQUM7QUFFMUIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEtBQU0sQ0FBQyxDQUFDLENBQUMseUVBQXlFO0FBRTNHLElBQUEsZUFBUyxFQUNQLCtDQUErQyxRQUFRLE1BQU0sRUFDN0QsSUFBQSxnQ0FBMEIsRUFBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDM0MsTUFBTSxJQUFBLHdDQUE2QixFQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztBQUN6RCxDQUFDLENBQUMsQ0FDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZnJvbVN0YWNrQ3JlYXRlc0RlcGxveWFibGVBcHAgfSBmcm9tIFwiLi90ZXN0Y2FzZVwiO1xuaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoRXh0ZW5kZWRUaW1lb3V0Rml4dHVyZSB9IGZyb20gXCIuLi8uLi8uLi9saWJcIjtcblxuY29uc3QgbGFuZ3VhZ2UgPSAnY3NoYXJwJztcblxuamVzdC5zZXRUaW1lb3V0KDIgKiA2MCAqIDYwXzAwMCk7IC8vIEluY2x1ZGVzIHRoZSB0aW1lIHRvIGFjcXVpcmUgbG9ja3MsIHdvcnN0LWNhc2Ugc2luZ2xlLXRocmVhZGVkIHJ1bnRpbWVcblxuaW50ZWdUZXN0KFxuICBgY2RrIG1pZ3JhdGUgLS1mcm9tLXN0YWNrIGNyZWF0ZXMgZGVwbG95YWJsZSAke2xhbmd1YWdlfSBhcHBgLFxuICB3aXRoRXh0ZW5kZWRUaW1lb3V0Rml4dHVyZShhc3luYyAoZml4dHVyZSkgPT4ge1xuICAgIGF3YWl0IGZyb21TdGFja0NyZWF0ZXNEZXBsb3lhYmxlQXBwKGZpeHR1cmUsIGxhbmd1YWdlKTtcbiAgfSksXG4pO1xuIl19
|
|
@@ -3,6 +3,8 @@ import { integTest, withExtendedTimeoutFixture } from "../../../lib";
|
|
|
3
3
|
|
|
4
4
|
const language = 'csharp';
|
|
5
5
|
|
|
6
|
+
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
7
|
+
|
|
6
8
|
integTest(
|
|
7
9
|
`cdk migrate --from-stack creates deployable ${language} app`,
|
|
8
10
|
withExtendedTimeoutFixture(async (fixture) => {
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const testcase_1 = require("./testcase");
|
|
4
4
|
const lib_1 = require("../../../lib");
|
|
5
5
|
const language = 'java';
|
|
6
|
+
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
6
7
|
(0, lib_1.integTest)(`cdk migrate --from-stack creates deployable ${language} app`, (0, lib_1.withExtendedTimeoutFixture)(async (fixture) => {
|
|
7
8
|
await (0, testcase_1.fromStackCreatesDeployableApp)(fixture, language);
|
|
8
9
|
}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1pZ3JhdGUtLWZyb20tc3RhY2stY3JlYXRlcy1kZXBsb3lhYmxlLWFwcC1qYXZhLmludGVndGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNkay1taWdyYXRlLS1mcm9tLXN0YWNrLWNyZWF0ZXMtZGVwbG95YWJsZS1hcHAtamF2YS5pbnRlZ3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBMkQ7QUFDM0Qsc0NBQXFFO0FBRXJFLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQztBQUV4QixJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsS0FBTSxDQUFDLENBQUMsQ0FBQyx5RUFBeUU7QUFHM0csSUFBQSxlQUFTLEVBQ1AsK0NBQStDLFFBQVEsTUFBTSxFQUM3RCxJQUFBLGdDQUEwQixFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUMzQyxNQUFNLElBQUEsd0NBQTZCLEVBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ3pELENBQUMsQ0FBQyxDQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmcm9tU3RhY2tDcmVhdGVzRGVwbG95YWJsZUFwcCB9IGZyb20gXCIuL3Rlc3RjYXNlXCI7XG5pbXBvcnQgeyBpbnRlZ1Rlc3QsIHdpdGhFeHRlbmRlZFRpbWVvdXRGaXh0dXJlIH0gZnJvbSBcIi4uLy4uLy4uL2xpYlwiO1xuXG5jb25zdCBsYW5ndWFnZSA9ICdqYXZhJztcblxuamVzdC5zZXRUaW1lb3V0KDIgKiA2MCAqIDYwXzAwMCk7IC8vIEluY2x1ZGVzIHRoZSB0aW1lIHRvIGFjcXVpcmUgbG9ja3MsIHdvcnN0LWNhc2Ugc2luZ2xlLXRocmVhZGVkIHJ1bnRpbWVcblxuXG5pbnRlZ1Rlc3QoXG4gIGBjZGsgbWlncmF0ZSAtLWZyb20tc3RhY2sgY3JlYXRlcyBkZXBsb3lhYmxlICR7bGFuZ3VhZ2V9IGFwcGAsXG4gIHdpdGhFeHRlbmRlZFRpbWVvdXRGaXh0dXJlKGFzeW5jIChmaXh0dXJlKSA9PiB7XG4gICAgYXdhaXQgZnJvbVN0YWNrQ3JlYXRlc0RlcGxveWFibGVBcHAoZml4dHVyZSwgbGFuZ3VhZ2UpO1xuICB9KSxcbik7XG4iXX0=
|
|
@@ -3,6 +3,9 @@ import { integTest, withExtendedTimeoutFixture } from "../../../lib";
|
|
|
3
3
|
|
|
4
4
|
const language = 'java';
|
|
5
5
|
|
|
6
|
+
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
7
|
+
|
|
8
|
+
|
|
6
9
|
integTest(
|
|
7
10
|
`cdk migrate --from-stack creates deployable ${language} app`,
|
|
8
11
|
withExtendedTimeoutFixture(async (fixture) => {
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const testcase_1 = require("./testcase");
|
|
4
4
|
const lib_1 = require("../../../lib");
|
|
5
5
|
const language = 'python';
|
|
6
|
+
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
6
7
|
(0, lib_1.integTest)(`cdk migrate --from-stack creates deployable ${language} app`, (0, lib_1.withExtendedTimeoutFixture)(async (fixture) => {
|
|
7
8
|
await (0, testcase_1.fromStackCreatesDeployableApp)(fixture, language);
|
|
8
9
|
}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1pZ3JhdGUtLWZyb20tc3RhY2stY3JlYXRlcy1kZXBsb3lhYmxlLWFwcC1weXRob24uaW50ZWd0ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY2RrLW1pZ3JhdGUtLWZyb20tc3RhY2stY3JlYXRlcy1kZXBsb3lhYmxlLWFwcC1weXRob24uaW50ZWd0ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQTJEO0FBQzNELHNDQUFxRTtBQUVyRSxNQUFNLFFBQVEsR0FBRyxRQUFRLENBQUM7QUFFMUIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEtBQU0sQ0FBQyxDQUFDLENBQUMseUVBQXlFO0FBRTNHLElBQUEsZUFBUyxFQUNQLCtDQUErQyxRQUFRLE1BQU0sRUFDN0QsSUFBQSxnQ0FBMEIsRUFBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDM0MsTUFBTSxJQUFBLHdDQUE2QixFQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztBQUN6RCxDQUFDLENBQUMsQ0FDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZnJvbVN0YWNrQ3JlYXRlc0RlcGxveWFibGVBcHAgfSBmcm9tIFwiLi90ZXN0Y2FzZVwiO1xuaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoRXh0ZW5kZWRUaW1lb3V0Rml4dHVyZSB9IGZyb20gXCIuLi8uLi8uLi9saWJcIjtcblxuY29uc3QgbGFuZ3VhZ2UgPSAncHl0aG9uJztcblxuamVzdC5zZXRUaW1lb3V0KDIgKiA2MCAqIDYwXzAwMCk7IC8vIEluY2x1ZGVzIHRoZSB0aW1lIHRvIGFjcXVpcmUgbG9ja3MsIHdvcnN0LWNhc2Ugc2luZ2xlLXRocmVhZGVkIHJ1bnRpbWVcblxuaW50ZWdUZXN0KFxuICBgY2RrIG1pZ3JhdGUgLS1mcm9tLXN0YWNrIGNyZWF0ZXMgZGVwbG95YWJsZSAke2xhbmd1YWdlfSBhcHBgLFxuICB3aXRoRXh0ZW5kZWRUaW1lb3V0Rml4dHVyZShhc3luYyAoZml4dHVyZSkgPT4ge1xuICAgIGF3YWl0IGZyb21TdGFja0NyZWF0ZXNEZXBsb3lhYmxlQXBwKGZpeHR1cmUsIGxhbmd1YWdlKTtcbiAgfSksXG4pO1xuIl19
|
|
@@ -3,6 +3,8 @@ import { integTest, withExtendedTimeoutFixture } from "../../../lib";
|
|
|
3
3
|
|
|
4
4
|
const language = 'python';
|
|
5
5
|
|
|
6
|
+
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
7
|
+
|
|
6
8
|
integTest(
|
|
7
9
|
`cdk migrate --from-stack creates deployable ${language} app`,
|
|
8
10
|
withExtendedTimeoutFixture(async (fixture) => {
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const testcase_1 = require("./testcase");
|
|
4
4
|
const lib_1 = require("../../../lib");
|
|
5
5
|
const language = 'typescript';
|
|
6
|
+
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
6
7
|
(0, lib_1.integTest)(`cdk migrate --from-stack creates deployable ${language} app`, (0, lib_1.withExtendedTimeoutFixture)(async (fixture) => {
|
|
7
8
|
await (0, testcase_1.fromStackCreatesDeployableApp)(fixture, language);
|
|
8
9
|
}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1pZ3JhdGUtLWZyb20tc3RhY2stY3JlYXRlcy1kZXBsb3lhYmxlLWFwcC10eXBlc2NyaXB0LmludGVndGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNkay1taWdyYXRlLS1mcm9tLXN0YWNrLWNyZWF0ZXMtZGVwbG95YWJsZS1hcHAtdHlwZXNjcmlwdC5pbnRlZ3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBMkQ7QUFDM0Qsc0NBQXFFO0FBRXJFLE1BQU0sUUFBUSxHQUFHLFlBQVksQ0FBQztBQUU5QixJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsS0FBTSxDQUFDLENBQUMsQ0FBQyx5RUFBeUU7QUFFM0csSUFBQSxlQUFTLEVBQ1AsK0NBQStDLFFBQVEsTUFBTSxFQUM3RCxJQUFBLGdDQUEwQixFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUMzQyxNQUFNLElBQUEsd0NBQTZCLEVBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ3pELENBQUMsQ0FBQyxDQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmcm9tU3RhY2tDcmVhdGVzRGVwbG95YWJsZUFwcCB9IGZyb20gXCIuL3Rlc3RjYXNlXCI7XG5pbXBvcnQgeyBpbnRlZ1Rlc3QsIHdpdGhFeHRlbmRlZFRpbWVvdXRGaXh0dXJlIH0gZnJvbSBcIi4uLy4uLy4uL2xpYlwiO1xuXG5jb25zdCBsYW5ndWFnZSA9ICd0eXBlc2NyaXB0JztcblxuamVzdC5zZXRUaW1lb3V0KDIgKiA2MCAqIDYwXzAwMCk7IC8vIEluY2x1ZGVzIHRoZSB0aW1lIHRvIGFjcXVpcmUgbG9ja3MsIHdvcnN0LWNhc2Ugc2luZ2xlLXRocmVhZGVkIHJ1bnRpbWVcblxuaW50ZWdUZXN0KFxuICBgY2RrIG1pZ3JhdGUgLS1mcm9tLXN0YWNrIGNyZWF0ZXMgZGVwbG95YWJsZSAke2xhbmd1YWdlfSBhcHBgLFxuICB3aXRoRXh0ZW5kZWRUaW1lb3V0Rml4dHVyZShhc3luYyAoZml4dHVyZSkgPT4ge1xuICAgIGF3YWl0IGZyb21TdGFja0NyZWF0ZXNEZXBsb3lhYmxlQXBwKGZpeHR1cmUsIGxhbmd1YWdlKTtcbiAgfSksXG4pO1xuIl19
|
|
@@ -3,6 +3,8 @@ import { integTest, withExtendedTimeoutFixture } from "../../../lib";
|
|
|
3
3
|
|
|
4
4
|
const language = 'typescript';
|
|
5
5
|
|
|
6
|
+
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
7
|
+
|
|
6
8
|
integTest(
|
|
7
9
|
`cdk migrate --from-stack creates deployable ${language} app`,
|
|
8
10
|
withExtendedTimeoutFixture(async (fixture) => {
|
package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.js
CHANGED
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const testcase_1 = require("./testcase");
|
|
4
4
|
const lib_1 = require("../../../lib");
|
|
5
5
|
const language = 'csharp';
|
|
6
|
+
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
6
7
|
(0, lib_1.integTest)(`cdk migrate ${language} deploys successfully`, (0, lib_1.withCDKMigrateFixture)(language, async (fixture) => {
|
|
7
8
|
await (0, testcase_1.deploysSuccessfully)(fixture, language);
|
|
8
9
|
}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1pZ3JhdGUtZGVwbG95cy1zdWNjZXNzZnVsbHktY3NoYXJwLmludGVndGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNkay1taWdyYXRlLWRlcGxveXMtc3VjY2Vzc2Z1bGx5LWNzaGFycC5pbnRlZ3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBaUQ7QUFDakQsc0NBQWdFO0FBRWhFLE1BQU0sUUFBUSxHQUFHLFFBQVEsQ0FBQztBQUUxQixJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsS0FBTSxDQUFDLENBQUMsQ0FBQyx5RUFBeUU7QUFFM0csSUFBQSxlQUFTLEVBQ1AsZUFBZSxRQUFRLHVCQUF1QixFQUM5QyxJQUFBLDJCQUFxQixFQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFFaEQsTUFBTSxJQUFBLDhCQUFtQixFQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztBQUUvQyxDQUFDLENBQUMsQ0FDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGVwbG95c1N1Y2Nlc3NmdWxseSB9IGZyb20gJy4vdGVzdGNhc2UnO1xuaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoQ0RLTWlncmF0ZUZpeHR1cmUgfSBmcm9tIFwiLi4vLi4vLi4vbGliXCI7XG5cbmNvbnN0IGxhbmd1YWdlID0gJ2NzaGFycCc7XG5cbmplc3Quc2V0VGltZW91dCgyICogNjAgKiA2MF8wMDApOyAvLyBJbmNsdWRlcyB0aGUgdGltZSB0byBhY3F1aXJlIGxvY2tzLCB3b3JzdC1jYXNlIHNpbmdsZS10aHJlYWRlZCBydW50aW1lXG5cbmludGVnVGVzdChcbiAgYGNkayBtaWdyYXRlICR7bGFuZ3VhZ2V9IGRlcGxveXMgc3VjY2Vzc2Z1bGx5YCxcbiAgd2l0aENES01pZ3JhdGVGaXh0dXJlKGxhbmd1YWdlLCBhc3luYyAoZml4dHVyZSkgPT4ge1xuXG4gICAgYXdhaXQgZGVwbG95c1N1Y2Nlc3NmdWxseShmaXh0dXJlLCBsYW5ndWFnZSk7XG5cbiAgfSksXG4pO1xuIl19
|
package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts
CHANGED
|
@@ -3,6 +3,8 @@ import { integTest, withCDKMigrateFixture } from "../../../lib";
|
|
|
3
3
|
|
|
4
4
|
const language = 'csharp';
|
|
5
5
|
|
|
6
|
+
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
7
|
+
|
|
6
8
|
integTest(
|
|
7
9
|
`cdk migrate ${language} deploys successfully`,
|
|
8
10
|
withCDKMigrateFixture(language, async (fixture) => {
|
package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.js
CHANGED
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const testcase_1 = require("./testcase");
|
|
4
4
|
const lib_1 = require("../../../lib");
|
|
5
5
|
const language = 'java';
|
|
6
|
+
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
6
7
|
(0, lib_1.integTest)(`cdk migrate ${language} deploys successfully`, (0, lib_1.withCDKMigrateFixture)(language, async (fixture) => {
|
|
7
8
|
await (0, testcase_1.deploysSuccessfully)(fixture, language);
|
|
8
9
|
}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1pZ3JhdGUtZGVwbG95cy1zdWNjZXNzZnVsbHktamF2YS5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjZGstbWlncmF0ZS1kZXBsb3lzLXN1Y2Nlc3NmdWxseS1qYXZhLmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUFpRDtBQUNqRCxzQ0FBZ0U7QUFFaEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDO0FBRXhCLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFNLENBQUMsQ0FBQyxDQUFDLHlFQUF5RTtBQUUzRyxJQUFBLGVBQVMsRUFDUCxlQUFlLFFBQVEsdUJBQXVCLEVBQzlDLElBQUEsMkJBQXFCLEVBQUMsUUFBUSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUVoRCxNQUFNLElBQUEsOEJBQW1CLEVBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBRS9DLENBQUMsQ0FBQyxDQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZXBsb3lzU3VjY2Vzc2Z1bGx5IH0gZnJvbSAnLi90ZXN0Y2FzZSc7XG5pbXBvcnQgeyBpbnRlZ1Rlc3QsIHdpdGhDREtNaWdyYXRlRml4dHVyZSB9IGZyb20gXCIuLi8uLi8uLi9saWJcIjtcblxuY29uc3QgbGFuZ3VhZ2UgPSAnamF2YSc7XG5cbmplc3Quc2V0VGltZW91dCgyICogNjAgKiA2MF8wMDApOyAvLyBJbmNsdWRlcyB0aGUgdGltZSB0byBhY3F1aXJlIGxvY2tzLCB3b3JzdC1jYXNlIHNpbmdsZS10aHJlYWRlZCBydW50aW1lXG5cbmludGVnVGVzdChcbiAgYGNkayBtaWdyYXRlICR7bGFuZ3VhZ2V9IGRlcGxveXMgc3VjY2Vzc2Z1bGx5YCxcbiAgd2l0aENES01pZ3JhdGVGaXh0dXJlKGxhbmd1YWdlLCBhc3luYyAoZml4dHVyZSkgPT4ge1xuXG4gICAgYXdhaXQgZGVwbG95c1N1Y2Nlc3NmdWxseShmaXh0dXJlLCBsYW5ndWFnZSk7XG5cbiAgfSksXG4pO1xuIl19
|
package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.ts
CHANGED
|
@@ -3,6 +3,8 @@ import { integTest, withCDKMigrateFixture } from "../../../lib";
|
|
|
3
3
|
|
|
4
4
|
const language = 'java';
|
|
5
5
|
|
|
6
|
+
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
7
|
+
|
|
6
8
|
integTest(
|
|
7
9
|
`cdk migrate ${language} deploys successfully`,
|
|
8
10
|
withCDKMigrateFixture(language, async (fixture) => {
|
package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.js
CHANGED
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const testcase_1 = require("./testcase");
|
|
4
4
|
const lib_1 = require("../../../lib");
|
|
5
5
|
const language = 'python';
|
|
6
|
+
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
6
7
|
(0, lib_1.integTest)(`cdk migrate ${language} deploys successfully`, (0, lib_1.withCDKMigrateFixture)(language, async (fixture) => {
|
|
7
8
|
await (0, testcase_1.deploysSuccessfully)(fixture, language);
|
|
8
9
|
}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1pZ3JhdGUtZGVwbG95cy1zdWNjZXNzZnVsbHktcHl0aG9uLmludGVndGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNkay1taWdyYXRlLWRlcGxveXMtc3VjY2Vzc2Z1bGx5LXB5dGhvbi5pbnRlZ3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBaUQ7QUFDakQsc0NBQWdFO0FBRWhFLE1BQU0sUUFBUSxHQUFHLFFBQVEsQ0FBQztBQUUxQixJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsS0FBTSxDQUFDLENBQUMsQ0FBQyx5RUFBeUU7QUFFM0csSUFBQSxlQUFTLEVBQ1AsZUFBZSxRQUFRLHVCQUF1QixFQUM5QyxJQUFBLDJCQUFxQixFQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFFaEQsTUFBTSxJQUFBLDhCQUFtQixFQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztBQUUvQyxDQUFDLENBQUMsQ0FDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGVwbG95c1N1Y2Nlc3NmdWxseSB9IGZyb20gJy4vdGVzdGNhc2UnO1xuaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoQ0RLTWlncmF0ZUZpeHR1cmUgfSBmcm9tIFwiLi4vLi4vLi4vbGliXCI7XG5cbmNvbnN0IGxhbmd1YWdlID0gJ3B5dGhvbic7XG5cbmplc3Quc2V0VGltZW91dCgyICogNjAgKiA2MF8wMDApOyAvLyBJbmNsdWRlcyB0aGUgdGltZSB0byBhY3F1aXJlIGxvY2tzLCB3b3JzdC1jYXNlIHNpbmdsZS10aHJlYWRlZCBydW50aW1lXG5cbmludGVnVGVzdChcbiAgYGNkayBtaWdyYXRlICR7bGFuZ3VhZ2V9IGRlcGxveXMgc3VjY2Vzc2Z1bGx5YCxcbiAgd2l0aENES01pZ3JhdGVGaXh0dXJlKGxhbmd1YWdlLCBhc3luYyAoZml4dHVyZSkgPT4ge1xuXG4gICAgYXdhaXQgZGVwbG95c1N1Y2Nlc3NmdWxseShmaXh0dXJlLCBsYW5ndWFnZSk7XG5cbiAgfSksXG4pO1xuIl19
|
package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.ts
CHANGED
|
@@ -3,6 +3,8 @@ import { integTest, withCDKMigrateFixture } from "../../../lib";
|
|
|
3
3
|
|
|
4
4
|
const language = 'python';
|
|
5
5
|
|
|
6
|
+
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
7
|
+
|
|
6
8
|
integTest(
|
|
7
9
|
`cdk migrate ${language} deploys successfully`,
|
|
8
10
|
withCDKMigrateFixture(language, async (fixture) => {
|
package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.js
CHANGED
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const testcase_1 = require("./testcase");
|
|
4
4
|
const lib_1 = require("../../../lib");
|
|
5
5
|
const language = 'typescript';
|
|
6
|
+
jest.setTimeout(2 * 60 * 60000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
6
7
|
(0, lib_1.integTest)(`cdk migrate ${language} deploys successfully`, (0, lib_1.withCDKMigrateFixture)(language, async (fixture) => {
|
|
7
8
|
await (0, testcase_1.deploysSuccessfully)(fixture, language);
|
|
8
9
|
}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1pZ3JhdGUtZGVwbG95cy1zdWNjZXNzZnVsbHktdHlwZXNjcmlwdC5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjZGstbWlncmF0ZS1kZXBsb3lzLXN1Y2Nlc3NmdWxseS10eXBlc2NyaXB0LmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUFpRDtBQUNqRCxzQ0FBZ0U7QUFFaEUsTUFBTSxRQUFRLEdBQUcsWUFBWSxDQUFDO0FBRTlCLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFNLENBQUMsQ0FBQyxDQUFDLHlFQUF5RTtBQUUzRyxJQUFBLGVBQVMsRUFDUCxlQUFlLFFBQVEsdUJBQXVCLEVBQzlDLElBQUEsMkJBQXFCLEVBQUMsUUFBUSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUVoRCxNQUFNLElBQUEsOEJBQW1CLEVBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBRS9DLENBQUMsQ0FBQyxDQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZXBsb3lzU3VjY2Vzc2Z1bGx5IH0gZnJvbSAnLi90ZXN0Y2FzZSc7XG5pbXBvcnQgeyBpbnRlZ1Rlc3QsIHdpdGhDREtNaWdyYXRlRml4dHVyZSB9IGZyb20gXCIuLi8uLi8uLi9saWJcIjtcblxuY29uc3QgbGFuZ3VhZ2UgPSAndHlwZXNjcmlwdCc7XG5cbmplc3Quc2V0VGltZW91dCgyICogNjAgKiA2MF8wMDApOyAvLyBJbmNsdWRlcyB0aGUgdGltZSB0byBhY3F1aXJlIGxvY2tzLCB3b3JzdC1jYXNlIHNpbmdsZS10aHJlYWRlZCBydW50aW1lXG5cbmludGVnVGVzdChcbiAgYGNkayBtaWdyYXRlICR7bGFuZ3VhZ2V9IGRlcGxveXMgc3VjY2Vzc2Z1bGx5YCxcbiAgd2l0aENES01pZ3JhdGVGaXh0dXJlKGxhbmd1YWdlLCBhc3luYyAoZml4dHVyZSkgPT4ge1xuXG4gICAgYXdhaXQgZGVwbG95c1N1Y2Nlc3NmdWxseShmaXh0dXJlLCBsYW5ndWFnZSk7XG5cbiAgfSksXG4pO1xuIl19
|
package/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts
CHANGED
|
@@ -3,6 +3,8 @@ import { integTest, withCDKMigrateFixture } from "../../../lib";
|
|
|
3
3
|
|
|
4
4
|
const language = 'typescript';
|
|
5
5
|
|
|
6
|
+
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
|
|
7
|
+
|
|
6
8
|
integTest(
|
|
7
9
|
`cdk migrate ${language} deploys successfully`,
|
|
8
10
|
withCDKMigrateFixture(language, async (fixture) => {
|