feat(cli-integ): bootstrap test environments with a random qualifier by mrgrain · Pull Request #1789 · aws/aws-cdk-cli

mrgrain · 2026-07-31T10:22:27Z

Fixes #

The integ tests bootstrap every environment with the fixed default qualifier, so the bootstrap bucket always gets the same deterministic name. With recycled test environments this regularly makes the bucket name unavailable — S3's eventual consistency lets CloudFormation believe the previous bucket still exists and the bootstrap fails. We currently paper over this with a retry loop.

This change bootstraps each test fixture with its own random qualifier and toolkit stack name, making bucket names unique so the collision can't occur (the retry stays as a safety net). As a bonus, every test now exercises the custom bootstrap qualifier feature instead of always running on the default.

Apps automatically receive the qualifier: TestFixture keeps an app context dict (seeded with the qualifier) that the app fixtures write into the app's cdk.json. This also covers invocations bypassing fixture.cdk(), and command-line --context still wins. Tests can add their own context via addAppContext() or the nestable withAppContext() block. Tests that hardcoded default-qualifier resource names now derive them from the fixture.

Checklist

This change contains a major version upgrade for a dependency and I confirm all breaking changes are addressed
- Release notes for the new version:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

github-actions · 2026-07-31T10:22:38Z

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Scanned Files

None

mrgrain · 2026-07-31T10:23:24Z

+   * `toolkitStackName: fixture.bootstrapStackName` (or via `ensureBootstrapped`,
+   * which uses that stack name by default).
+   */
  public async bootstrapRepoName(): Promise<string> {


Removed the ensureBootstrapped() call that used to be here. It was vestigial: it bootstrapped the default CDKToolkit stack, which never matched the fixture.bootstrapStackName lookup below — the assertion only ever passed because all callers (the gc ECR tests) explicitly bootstrap that stack first. With the new per-fixture bootstrap it would have become harmful, re-bootstrapping the caller's stack with --bootstrap-kms-key-id AWS_MANAGED_KEY and triggering a CloudFormation update (bucket encryption change) mid-test.

Instead of bootstrapping every test environment with the fixed default qualifier, each test fixture now bootstraps with its own random qualifier and a per-fixture toolkit stack name. This makes bootstrap bucket names unique across (potentially recycled) test environments, avoiding S3 eventual-consistency collisions on the fixed default bucket name. Apps automatically receive the qualifier: TestFixture keeps an app context dict (seeded with the qualifier) that the app fixtures write into the app's cdk.json. Tests can add more context via addAppContext() or the new nestable withAppContext() block.

mrgrain temporarily deployed to automation July 31, 2026 10:22 — with GitHub Actions Inactive

github-actions Bot added the p2 label Jul 31, 2026

mrgrain temporarily deployed to no-approval July 31, 2026 10:22 — with GitHub Actions Inactive

aws-cdk-automation requested a review from a team July 31, 2026 10:22

aws-cdk-automation enabled auto-merge July 31, 2026 10:22

mrgrain commented Jul 31, 2026

View reviewed changes