@aws-cdk-testing/cli-integ 3.2.3 → 3.3.0

package/tests/cli-integ-tests/cli.integtest.ts

@@ -23,6 +23,7 @@ import { PutObjectLockConfigurationCommand } from '@aws-sdk/client-s3';
 import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns';
 import { AssumeRoleCommand, GetCallerIdentityCommand } from '@aws-sdk/client-sts';
 import {
+  CdkCliOptions,
   cloneDirectory,
   integTest,
   randomInteger,
@@ -61,7 +62,7 @@ describe('ci', () => {
     integTest(
       'output to stdout',
       withDefaultFixture(async (fixture) => {
-        const execOptions = {
+        const execOptions: CdkCliOptions = {
           captureStderr: true,
           onlyStderr: true,
           modEnv: {
@@ -70,6 +71,7 @@ describe('ci', () => {
             JSII_SILENCE_WARNING_UNTESTED_NODE_VERSION: 'true',
             JSII_SILENCE_WARNING_DEPRECATED_NODE_VERSION: 'true',
           },
+          options: ['--no-notices'],
         };
 
         const deployOutput = await fixture.cdkDeploy('test-2', execOptions);

package/tests/cli-integ-tests/proxy.integtest.js

@@ -50,7 +50,6 @@ async function runInIsolatedContainer(fixture, pathsToMount, testCommands) {
             'public.ecr.aws/ubuntu/ubuntu:24.04_stable',
             `${scriptName}`,
         ], {
-            stdio: 'inherit',
             modEnv: {
                 AWS_ACCESS_KEY_ID: credentials.accessKeyId,
                 AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
@@ -144,4 +143,4 @@ function findMountableParent(dir) {
     }
     return dir;
 }
-//# 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"]}
+//# 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      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"]}

package/tests/cli-integ-tests/proxy.integtest.ts

@@ -65,7 +65,6 @@ async function runInIsolatedContainer(fixture: TestFixture, pathsToMount: string
       'public.ecr.aws/ubuntu/ubuntu:24.04_stable',
       `${scriptName}`,
     ], {
-      stdio: 'inherit',
       modEnv: {
         AWS_ACCESS_KEY_ID: credentials.accessKeyId,
         AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,

package/tests/tool-integrations/amplify.integtest.js

@@ -15,7 +15,8 @@ const TIMEOUT = 1800000;
     await shell.shell(['npm', 'init', '-y']);
     await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);
     // This will create 'package.json' implicating a certain version of the CDK
-    await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
+    await shell.shell(['npm', 'config', 'set', 'save-exact', 'true']);
+    await mutateAmplifyDepOnCdk(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
     ////////////////////////////////////////////////////////////////////////
     //  Run the `npm create` workflow
     //
@@ -39,15 +40,23 @@ const TIMEOUT = 1800000;
         });
     }
 }), TIMEOUT);
-async function updateCdkDependency(context, cliVersion, libVersion) {
-    const filename = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');
-    const pj = JSON.parse(await fs_1.promises.readFile(filename, { encoding: 'utf-8' }));
+async function mutateAmplifyDepOnCdk(context, cliVersion, libVersion) {
+    // default_packages.json is where create-amplify reads when installing npm dependencies
+    const amplifyDepFile = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');
+    const amplifyDepJson = JSON.parse(await fs_1.promises.readFile(amplifyDepFile, { encoding: 'utf-8' }));
     // Be extra paranoid about the types here, since we don't fully control them
-    assertIsObject(pj);
-    assertIsStringArray(pj.defaultDevPackages);
-    replacePackageVersionIn('aws-cdk', cliVersion, pj.defaultDevPackages);
-    replacePackageVersionIn('aws-cdk-lib', libVersion, pj.defaultDevPackages);
-    await fs_1.promises.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
+    assertIsObject(amplifyDepJson);
+    assertIsStringArray(amplifyDepJson.defaultDevPackages);
+    replacePackageVersionIn('aws-cdk', cliVersion, amplifyDepJson.defaultDevPackages);
+    replacePackageVersionIn('aws-cdk-lib', libVersion, amplifyDepJson.defaultDevPackages);
+    await fs_1.promises.writeFile(amplifyDepFile, JSON.stringify(amplifyDepJson, undefined, 2), { encoding: 'utf-8' });
+    const packageJsonFile = path.join(context.integTestDir, 'package.json');
+    const packageJson = JSON.parse(await fs_1.promises.readFile(packageJsonFile, { encoding: 'utf-8' }));
+    assertIsObject(packageJson);
+    packageJson.overrides = {
+        "aws-cdk-lib": libVersion,
+    };
+    await fs_1.promises.writeFile(packageJsonFile, JSON.stringify(packageJson, undefined, 2), { encoding: 'utf-8' });
 }
 /**
  * Mutably update the given string array, replacing the version of packages with the given name
@@ -82,4 +91,4 @@ function assertIsStringArray(xs) {
         throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"amplify.integtest.js","sourceRoot":"","sources":["amplify.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'fs';\nimport * as path from 'path';\nimport { withToolContext } from './with-tool-context';\nimport { integTest, ShellHelper, TemporaryDirectoryContext } from '../../lib';\n\nconst TIMEOUT = 1800_000;\n\nintegTest('amplify integration', withToolContext(async (context) => {\n  const shell = ShellHelper.fromContext(context);\n\n  ////////////////////////////////////////////////////////////////////////\n  //  Make sure that create-amplify installs the right versions of the CLI and framework\n  //\n\n  // Install `create-amplify` without running it, then hack the json file with the\n  // package versions in it before we execute.\n  await shell.shell(['npm', 'init', '-y']);\n  await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);\n  // This will create 'package.json' implicating a certain version of the CDK\n  await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());\n\n  ////////////////////////////////////////////////////////////////////////\n  //  Run the `npm create` workflow\n  //\n\n  // I tested to confirm that this will use the locally installed `create-amplify`\n  await shell.shell(['npm', 'create', '-y', 'amplify']);\n  await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);\n\n  await shell.shell(['npx', 'ampx', 'sandbox', '--once'], {\n    modEnv: {\n      AWS_REGION: context.aws.region,\n    },\n  });\n  try {\n\n    // Future code goes here, putting the try/finally here already so it doesn't\n    // get forgotten.\n\n  } finally {\n    await shell.shell(['npx', 'ampx', 'sandbox', 'delete', '--yes'], {\n      modEnv: {\n        AWS_REGION: context.aws.region,\n      },\n    });\n  }\n}), TIMEOUT);\n\nasync function updateCdkDependency(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {\n  const filename = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');\n  const pj: unknown = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));\n\n  // Be extra paranoid about the types here, since we don't fully control them\n  assertIsObject(pj);\n  assertIsStringArray(pj.defaultDevPackages);\n\n  replacePackageVersionIn('aws-cdk', cliVersion, pj.defaultDevPackages);\n  replacePackageVersionIn('aws-cdk-lib', libVersion, pj.defaultDevPackages);\n\n  await fs.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });\n}\n\n/**\n * Mutably update the given string array, replacing the version of packages with the given name\n *\n * We assume the list of packages is a string array of the form\n *\n * ```\n * [\"package@version\", \"package@version\", ...]\n * ```\n *\n * It's a failure if we don't find an entry to update.\n */\nfunction replacePackageVersionIn(packName: string, version: string, xs: string[]) {\n  let didUpdate = false;\n  for (let i = 0; i < xs.length; i++) {\n    if (xs[i].startsWith(`${packName}@`)) {\n      xs[i] = `${packName}@${version}`;\n      didUpdate = true;\n    }\n  }\n\n  if (!didUpdate) {\n    throw new Error(`Did not find a package version to update for ${packName} in ${JSON.stringify(xs)}`);\n  }\n}\n\nfunction assertIsObject(xs: unknown): asserts xs is Record<string, unknown> {\n  if (typeof xs !== 'object' || xs === null) {\n    throw new Error(`Expected object, got ${JSON.stringify(xs)}`);\n  }\n}\n\nfunction assertIsStringArray(xs: unknown): asserts xs is string[] {\n  if (!Array.isArray(xs) || xs.length === 0 || typeof xs[0] !== 'string') {\n    throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"amplify.integtest.js","sourceRoot":"","sources":["amplify.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'fs';\nimport * as path from 'path';\nimport { withToolContext } from './with-tool-context';\nimport { integTest, ShellHelper, TemporaryDirectoryContext } from '../../lib';\n\nconst TIMEOUT = 1800_000;\n\nintegTest('amplify integration', withToolContext(async (context) => {\n  const shell = ShellHelper.fromContext(context);\n\n  ////////////////////////////////////////////////////////////////////////\n  //  Make sure that create-amplify installs the right versions of the CLI and framework\n  //\n\n  // Install `create-amplify` without running it, then hack the json file with the\n  // package versions in it before we execute.\n  await shell.shell(['npm', 'init', '-y']);\n  await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);\n  // This will create 'package.json' implicating a certain version of the CDK\n  await shell.shell(['npm', 'config', 'set', 'save-exact', 'true']);\n  await mutateAmplifyDepOnCdk(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());\n\n  ////////////////////////////////////////////////////////////////////////\n  //  Run the `npm create` workflow\n  //\n\n  // I tested to confirm that this will use the locally installed `create-amplify`\n  await shell.shell(['npm', 'create', '-y', 'amplify']);\n  await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);\n\n  await shell.shell(['npx', 'ampx', 'sandbox', '--once'], {\n    modEnv: {\n      AWS_REGION: context.aws.region,\n    },\n  });\n  try {\n\n    // Future code goes here, putting the try/finally here already so it doesn't\n    // get forgotten.\n\n  } finally {\n    await shell.shell(['npx', 'ampx', 'sandbox', 'delete', '--yes'], {\n      modEnv: {\n        AWS_REGION: context.aws.region,\n      },\n    });\n  }\n}), TIMEOUT);\n\nasync function mutateAmplifyDepOnCdk(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {\n  // default_packages.json is where create-amplify reads when installing npm dependencies\n  const amplifyDepFile = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');\n  const amplifyDepJson: unknown = JSON.parse(await fs.readFile(amplifyDepFile, { encoding: 'utf-8' }));\n\n  // Be extra paranoid about the types here, since we don't fully control them\n  assertIsObject(amplifyDepJson);\n  assertIsStringArray(amplifyDepJson.defaultDevPackages);\n\n  replacePackageVersionIn('aws-cdk', cliVersion, amplifyDepJson.defaultDevPackages);\n  replacePackageVersionIn('aws-cdk-lib', libVersion, amplifyDepJson.defaultDevPackages);\n\n  await fs.writeFile(amplifyDepFile, JSON.stringify(amplifyDepJson, undefined, 2), { encoding: 'utf-8' });\n\n  const packageJsonFile = path.join(context.integTestDir, 'package.json');\n  const packageJson: unknown = JSON.parse(await fs.readFile(packageJsonFile, { encoding: 'utf-8' }));\n\n  assertIsObject(packageJson);\n  packageJson.overrides = {\n    \"aws-cdk-lib\": libVersion,\n  };\n  await fs.writeFile(packageJsonFile, JSON.stringify(packageJson, undefined, 2), { encoding: 'utf-8' })\n}\n\n/**\n * Mutably update the given string array, replacing the version of packages with the given name\n *\n * We assume the list of packages is a string array of the form\n *\n * ```\n * [\"package@version\", \"package@version\", ...]\n * ```\n *\n * It's a failure if we don't find an entry to update.\n */\nfunction replacePackageVersionIn(packName: string, version: string, xs: string[]) {\n  let didUpdate = false;\n  for (let i = 0; i < xs.length; i++) {\n    if (xs[i].startsWith(`${packName}@`)) {\n      xs[i] = `${packName}@${version}`;\n      didUpdate = true;\n    }\n  }\n\n  if (!didUpdate) {\n    throw new Error(`Did not find a package version to update for ${packName} in ${JSON.stringify(xs)}`);\n  }\n}\n\nfunction assertIsObject(xs: unknown): asserts xs is Record<string, unknown> {\n  if (typeof xs !== 'object' || xs === null) {\n    throw new Error(`Expected object, got ${JSON.stringify(xs)}`);\n  }\n}\n\nfunction assertIsStringArray(xs: unknown): asserts xs is string[] {\n  if (!Array.isArray(xs) || xs.length === 0 || typeof xs[0] !== 'string') {\n    throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);\n  }\n}\n"]}

package/tests/tool-integrations/amplify.integtest.ts

@@ -17,7 +17,8 @@ integTest('amplify integration', withToolContext(async (context) => {
   await shell.shell(['npm', 'init', '-y']);
   await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);
   // This will create 'package.json' implicating a certain version of the CDK
-  await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
+  await shell.shell(['npm', 'config', 'set', 'save-exact', 'true']);
+  await mutateAmplifyDepOnCdk(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
 
   ////////////////////////////////////////////////////////////////////////
   //  Run the `npm create` workflow
@@ -46,18 +47,28 @@ integTest('amplify integration', withToolContext(async (context) => {
   }
 }), TIMEOUT);
 
-async function updateCdkDependency(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {
-  const filename = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');
-  const pj: unknown = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));
+async function mutateAmplifyDepOnCdk(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {
+  // default_packages.json is where create-amplify reads when installing npm dependencies
+  const amplifyDepFile = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');
+  const amplifyDepJson: unknown = JSON.parse(await fs.readFile(amplifyDepFile, { encoding: 'utf-8' }));
 
   // Be extra paranoid about the types here, since we don't fully control them
-  assertIsObject(pj);
-  assertIsStringArray(pj.defaultDevPackages);
+  assertIsObject(amplifyDepJson);
+  assertIsStringArray(amplifyDepJson.defaultDevPackages);
 
-  replacePackageVersionIn('aws-cdk', cliVersion, pj.defaultDevPackages);
-  replacePackageVersionIn('aws-cdk-lib', libVersion, pj.defaultDevPackages);
+  replacePackageVersionIn('aws-cdk', cliVersion, amplifyDepJson.defaultDevPackages);
+  replacePackageVersionIn('aws-cdk-lib', libVersion, amplifyDepJson.defaultDevPackages);
 
-  await fs.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
+  await fs.writeFile(amplifyDepFile, JSON.stringify(amplifyDepJson, undefined, 2), { encoding: 'utf-8' });
+
+  const packageJsonFile = path.join(context.integTestDir, 'package.json');
+  const packageJson: unknown = JSON.parse(await fs.readFile(packageJsonFile, { encoding: 'utf-8' }));
+
+  assertIsObject(packageJson);
+  packageJson.overrides = {
+    "aws-cdk-lib": libVersion,
+  };
+  await fs.writeFile(packageJsonFile, JSON.stringify(packageJson, undefined, 2), { encoding: 'utf-8' })
 }
 
 /**