@aws-cdk-testing/cli-integ 3.36.3 → 3.37.0

package/lib/regions.d.ts

@@ -3,7 +3,3 @@ export declare function allBut(exclude: string[]): string[];
  * Regions that don't support CloudFormation Stack Refactoring
  */
 export declare const STACK_REFACTORING_REGIONS: string[];
-/**
- * Regions that don't support AWS::Bedrock::Agent
- */
-export declare const BEDROCK_AGENT_REGIONS: string[];

package/lib/regions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BEDROCK_AGENT_REGIONS = exports.STACK_REFACTORING_REGIONS = void 0;
+exports.STACK_REFACTORING_REGIONS = void 0;
 exports.allBut = allBut;
 /**
  * Regions supported by atmosphere
@@ -51,19 +51,4 @@ exports.STACK_REFACTORING_REGIONS = allBut([
     'ap-southeast-7',
     'mx-central-1',
 ]);
-/**
- * Regions that don't support AWS::Bedrock::Agent
- */
-exports.BEDROCK_AGENT_REGIONS = allBut([
-    'af-south-1',
-    'ap-east-1',
-    'ap-southeast-3',
-    'ap-southeast-4',
-    'ap-southeast-5',
-    'ap-southeast-7',
-    'ca-west-1',
-    'il-central-1',
-    'mx-central-1',
-    'us-west-1',
-]);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInJlZ2lvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBd0NBLHdCQUVDO0FBMUNEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLEdBQUc7SUFDbEIsV0FBVztJQUNYLFdBQVc7SUFDWCxXQUFXO0lBQ1gsV0FBVztJQUNYLFlBQVk7SUFDWixnQkFBZ0I7SUFDaEIsZ0JBQWdCO0lBQ2hCLGdCQUFnQjtJQUNoQixnQkFBZ0I7SUFDaEIsZ0JBQWdCO0lBQ2hCLGNBQWM7SUFDZCxjQUFjO0lBQ2QsV0FBVztJQUNYLFdBQVc7SUFDWCxXQUFXO0lBQ1gsWUFBWTtJQUNaLFdBQVc7SUFDWCxZQUFZO0lBQ1osV0FBVztJQUNYLFlBQVk7SUFDWixnQkFBZ0I7SUFDaEIsY0FBYztJQUNkLFlBQVk7SUFDWixnQkFBZ0I7SUFDaEIsWUFBWTtJQUNaLGNBQWM7SUFDZCxnQkFBZ0I7SUFDaEIsZ0JBQWdCO0lBQ2hCLFdBQVc7SUFDWCxjQUFjO0lBRWQsOENBQThDO0lBQzlDLGtCQUFrQjtJQUNsQixnQkFBZ0I7Q0FDakIsQ0FBQztBQUVGLFNBQWdCLE1BQU0sQ0FBQyxPQUFpQjtJQUN0QyxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzlFLENBQUM7QUFFRDs7R0FFRztBQUNVLFFBQUEseUJBQXlCLEdBQUcsTUFBTSxDQUFDO0lBQzlDLGdCQUFnQjtJQUNoQixnQkFBZ0I7SUFDaEIsY0FBYztDQUNmLENBQUMsQ0FBQztBQUVIOztHQUVHO0FBQ1UsUUFBQSxxQkFBcUIsR0FBRyxNQUFNLENBQUM7SUFDMUMsWUFBWTtJQUNaLFdBQVc7SUFDWCxnQkFBZ0I7SUFDaEIsZ0JBQWdCO0lBQ2hCLGdCQUFnQjtJQUNoQixnQkFBZ0I7SUFDaEIsV0FBVztJQUNYLGNBQWM7SUFDZCxjQUFjO0lBQ2QsV0FBVztDQUNaLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogUmVnaW9ucyBzdXBwb3J0ZWQgYnkgYXRtb3NwaGVyZVxuICovXG5jb25zdCBBTExfUkVHSU9OUyA9IFtcbiAgJ3VzLWVhc3QtMScsXG4gICd1cy1lYXN0LTInLFxuICAndXMtd2VzdC0xJyxcbiAgJ3VzLXdlc3QtMicsXG4gICdhcC1zb3V0aC0xJyxcbiAgJ2FwLW5vcnRoZWFzdC0xJyxcbiAgJ2FwLW5vcnRoZWFzdC0yJyxcbiAgJ2FwLW5vcnRoZWFzdC0zJyxcbiAgJ2FwLXNvdXRoZWFzdC0xJyxcbiAgJ2FwLXNvdXRoZWFzdC0yJyxcbiAgJ2NhLWNlbnRyYWwtMScsXG4gICdldS1jZW50cmFsLTEnLFxuICAnZXUtd2VzdC0xJyxcbiAgJ2V1LXdlc3QtMicsXG4gICdldS13ZXN0LTMnLFxuICAnZXUtbm9ydGgtMScsXG4gICdzYS1lYXN0LTEnLFxuICAnYWYtc291dGgtMScsXG4gICdhcC1lYXN0LTEnLFxuICAnYXAtc291dGgtMicsXG4gICdhcC1zb3V0aGVhc3QtNCcsXG4gICdldS1jZW50cmFsLTInLFxuICAnZXUtc291dGgtMScsXG4gICdhcC1zb3V0aGVhc3QtMycsXG4gICdldS1zb3V0aC0yJyxcbiAgJ2lsLWNlbnRyYWwtMScsXG4gICdhcC1zb3V0aGVhc3QtNScsXG4gICdhcC1zb3V0aGVhc3QtNycsXG4gICdjYS13ZXN0LTEnLFxuICAnbXgtY2VudHJhbC0xJyxcblxuICAvLyBjdXJyZW50bHkgZXhwZXJpZW5jaW5nIHNlcnZpY2UgZGlzcnVwdGlvbnMuXG4gIC8vICdtZS1jZW50cmFsLTEnLFxuICAvLyAnbWUtc291dGgtMScsXG5dO1xuXG5leHBvcnQgZnVuY3Rpb24gYWxsQnV0KGV4Y2x1ZGU6IHN0cmluZ1tdKTogc3RyaW5nW10ge1xuICByZXR1cm4gQXJyYXkuZnJvbShuZXcgU2V0KEFMTF9SRUdJT05TLmZpbHRlcigocikgPT4gIWV4Y2x1ZGUuaW5jbHVkZXMocikpKSk7XG59XG5cbi8qKlxuICogUmVnaW9ucyB0aGF0IGRvbid0IHN1cHBvcnQgQ2xvdWRGb3JtYXRpb24gU3RhY2sgUmVmYWN0b3JpbmdcbiAqL1xuZXhwb3J0IGNvbnN0IFNUQUNLX1JFRkFDVE9SSU5HX1JFR0lPTlMgPSBhbGxCdXQoW1xuICAnYXAtc291dGhlYXN0LTUnLFxuICAnYXAtc291dGhlYXN0LTcnLFxuICAnbXgtY2VudHJhbC0xJyxcbl0pO1xuXG4vKipcbiAqIFJlZ2lvbnMgdGhhdCBkb24ndCBzdXBwb3J0IEFXUzo6QmVkcm9jazo6QWdlbnRcbiAqL1xuZXhwb3J0IGNvbnN0IEJFRFJPQ0tfQUdFTlRfUkVHSU9OUyA9IGFsbEJ1dChbXG4gICdhZi1zb3V0aC0xJyxcbiAgJ2FwLWVhc3QtMScsXG4gICdhcC1zb3V0aGVhc3QtMycsXG4gICdhcC1zb3V0aGVhc3QtNCcsXG4gICdhcC1zb3V0aGVhc3QtNScsXG4gICdhcC1zb3V0aGVhc3QtNycsXG4gICdjYS13ZXN0LTEnLFxuICAnaWwtY2VudHJhbC0xJyxcbiAgJ214LWNlbnRyYWwtMScsXG4gICd1cy13ZXN0LTEnLFxuXSk7XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInJlZ2lvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBd0NBLHdCQUVDO0FBMUNEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLEdBQUc7SUFDbEIsV0FBVztJQUNYLFdBQVc7SUFDWCxXQUFXO0lBQ1gsV0FBVztJQUNYLFlBQVk7SUFDWixnQkFBZ0I7SUFDaEIsZ0JBQWdCO0lBQ2hCLGdCQUFnQjtJQUNoQixnQkFBZ0I7SUFDaEIsZ0JBQWdCO0lBQ2hCLGNBQWM7SUFDZCxjQUFjO0lBQ2QsV0FBVztJQUNYLFdBQVc7SUFDWCxXQUFXO0lBQ1gsWUFBWTtJQUNaLFdBQVc7SUFDWCxZQUFZO0lBQ1osV0FBVztJQUNYLFlBQVk7SUFDWixnQkFBZ0I7SUFDaEIsY0FBYztJQUNkLFlBQVk7SUFDWixnQkFBZ0I7SUFDaEIsWUFBWTtJQUNaLGNBQWM7SUFDZCxnQkFBZ0I7SUFDaEIsZ0JBQWdCO0lBQ2hCLFdBQVc7SUFDWCxjQUFjO0lBRWQsOENBQThDO0lBQzlDLGtCQUFrQjtJQUNsQixnQkFBZ0I7Q0FDakIsQ0FBQztBQUVGLFNBQWdCLE1BQU0sQ0FBQyxPQUFpQjtJQUN0QyxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzlFLENBQUM7QUFFRDs7R0FFRztBQUNVLFFBQUEseUJBQXlCLEdBQUcsTUFBTSxDQUFDO0lBQzlDLGdCQUFnQjtJQUNoQixnQkFBZ0I7SUFDaEIsY0FBYztDQUNmLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogUmVnaW9ucyBzdXBwb3J0ZWQgYnkgYXRtb3NwaGVyZVxuICovXG5jb25zdCBBTExfUkVHSU9OUyA9IFtcbiAgJ3VzLWVhc3QtMScsXG4gICd1cy1lYXN0LTInLFxuICAndXMtd2VzdC0xJyxcbiAgJ3VzLXdlc3QtMicsXG4gICdhcC1zb3V0aC0xJyxcbiAgJ2FwLW5vcnRoZWFzdC0xJyxcbiAgJ2FwLW5vcnRoZWFzdC0yJyxcbiAgJ2FwLW5vcnRoZWFzdC0zJyxcbiAgJ2FwLXNvdXRoZWFzdC0xJyxcbiAgJ2FwLXNvdXRoZWFzdC0yJyxcbiAgJ2NhLWNlbnRyYWwtMScsXG4gICdldS1jZW50cmFsLTEnLFxuICAnZXUtd2VzdC0xJyxcbiAgJ2V1LXdlc3QtMicsXG4gICdldS13ZXN0LTMnLFxuICAnZXUtbm9ydGgtMScsXG4gICdzYS1lYXN0LTEnLFxuICAnYWYtc291dGgtMScsXG4gICdhcC1lYXN0LTEnLFxuICAnYXAtc291dGgtMicsXG4gICdhcC1zb3V0aGVhc3QtNCcsXG4gICdldS1jZW50cmFsLTInLFxuICAnZXUtc291dGgtMScsXG4gICdhcC1zb3V0aGVhc3QtMycsXG4gICdldS1zb3V0aC0yJyxcbiAgJ2lsLWNlbnRyYWwtMScsXG4gICdhcC1zb3V0aGVhc3QtNScsXG4gICdhcC1zb3V0aGVhc3QtNycsXG4gICdjYS13ZXN0LTEnLFxuICAnbXgtY2VudHJhbC0xJyxcblxuICAvLyBjdXJyZW50bHkgZXhwZXJpZW5jaW5nIHNlcnZpY2UgZGlzcnVwdGlvbnMuXG4gIC8vICdtZS1jZW50cmFsLTEnLFxuICAvLyAnbWUtc291dGgtMScsXG5dO1xuXG5leHBvcnQgZnVuY3Rpb24gYWxsQnV0KGV4Y2x1ZGU6IHN0cmluZ1tdKTogc3RyaW5nW10ge1xuICByZXR1cm4gQXJyYXkuZnJvbShuZXcgU2V0KEFMTF9SRUdJT05TLmZpbHRlcigocikgPT4gIWV4Y2x1ZGUuaW5jbHVkZXMocikpKSk7XG59XG5cbi8qKlxuICogUmVnaW9ucyB0aGF0IGRvbid0IHN1cHBvcnQgQ2xvdWRGb3JtYXRpb24gU3RhY2sgUmVmYWN0b3JpbmdcbiAqL1xuZXhwb3J0IGNvbnN0IFNUQUNLX1JFRkFDVE9SSU5HX1JFR0lPTlMgPSBhbGxCdXQoW1xuICAnYXAtc291dGhlYXN0LTUnLFxuICAnYXAtc291dGhlYXN0LTcnLFxuICAnbXgtY2VudHJhbC0xJyxcbl0pO1xuXG4iXX0=

package/lib/with-cdk-app.d.ts

@@ -39,6 +39,25 @@ export declare function withDefaultFixture(block: (context: TestFixture) => Prom
 export declare function withSpecificFixture(appName: string, block: (context: TestFixture) => Promise<void>, options?: CdkAppContextOptions): (context: TestContext) => Promise<void>;
 export declare function withExtendedTimeoutFixture(block: (context: TestFixture) => Promise<void>, options?: CdkAppContextOptions): (context: TestContext) => Promise<void>;
 export declare function withCDKMigrateFixture(language: string, block: (content: TestFixture) => Promise<void>, options?: CdkAppContextOptions): (context: TestContext) => Promise<void>;
+/**
+ * Higher order function to add context values to the test app
+ *
+ * The context is written to the app's `cdk.json`, merged with the
+ * framework-provided defaults (like the random bootstrap qualifier) and any
+ * context added by enclosing `withAppContext` blocks. May be nested any
+ * number of times; inner blocks override outer blocks on key conflicts.
+ *
+ * Example:
+ *
+ * ```ts
+ * integTest('my test', withDefaultFixture(withAppContext({
+ *   '@aws-cdk/core:newStyleStackSynthesis': 'true',
+ * }, async (fixture) => {
+ *   // ...
+ * })));
+ * ```
+ */
+export declare function withAppContext(context: Record<string, string>, block: (fixture: TestFixture) => Promise<void>): (fixture: TestFixture) => Promise<void>;
 /**
  * Retry wrapper that executes a test callback up to maxAttempts times
  *
@@ -182,8 +201,38 @@ export declare class TestFixture extends ShellHelper {
     readonly cli: ITestCliSource;
     readonly cdkAssets: ITestCliSource;
     readonly library: ITestLibrarySource;
+    private readonly appContext;
     constructor(integTestDir: string, stackNamePrefix: string, output: NodeJS.WritableStream, aws: AwsClients, randomString: string);
     log(s: string): void;
+    /**
+     * Add context values for the test app, and write them to the app's `cdk.json`
+     *
+     * Values passed here accumulate with earlier calls, and override the
+     * framework-provided defaults (like the bootstrap qualifier). Command-line
+     * `--context` arguments still take precedence over all of these.
+     */
+    addAppContext(context: Record<string, string>, dir?: string): Promise<void>;
+    /**
+     * Remove a context value for the test app, and update the app's `cdk.json`
+     *
+     * Note: this only prevents the key from being written by this fixture;
+     * a value already present in the app's own `cdk.json` is left alone.
+     */
+    removeAppContext(key: string, dir?: string): Promise<void>;
+    /**
+     * Merge the accumulated app context into the app's `cdk.json`
+     *
+     * Also points `toolkitStackName` at the fixture's bootstrap stack, so that
+     * commands that look up the bootstrap stack by name (e.g. large-template
+     * deploys and refactors that need the staging bucket) find it without the
+     * test having to pass `--toolkit-stack-name` everywhere. Command-line
+     * arguments still take precedence.
+     *
+     * Called by the fixture factories as soon as the app directory exists;
+     * tests normally don't need to call this directly (use `addAppContext`
+     * or wrap the test block in `withAppContext` instead).
+     */
+    writeAppContext(dir?: string): Promise<void>;
     /**
      * Login to the public ECR gallery using the current AWS credentials.
      * Use this if your test needs to directly pull images outside of a `cdk` or `cdk-assets` command.
@@ -215,6 +264,13 @@ export declare class TestFixture extends ShellHelper {
         CI: string;
     };
     template(stackName: string): any;
+    /**
+     * Look up the ECR repository name of this fixture's bootstrap stack
+     *
+     * Expects the environment to have been bootstrapped already with
+     * `toolkitStackName: fixture.bootstrapStackName` (or via `ensureBootstrapped`,
+     * which uses that stack name by default).
+     */
     bootstrapRepoName(): Promise<string>;
     get bootstrapStackName(): string;
     fullStackName(stackName: string): string;