Merge branch 'main' into bobertzh/v3Migration

.gitattributes

@@ -1,18 +1,16 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
-
 # Currently, this repository has LF dependencies in building and testing, with json, sh, and no extensions.
 # Until this is fixed, it is best to just set the whole repository to be LF.
 * eol=lf
-
 *.gif binary
 *.zip binary
 *.png binary
 *.jpg binary
 *.tgz binary
 *.tar.gz binary
-
 # Hide snapshots from GitHub UI, except for the actual templates
 **/*.snapshot/** linguist-generated
 **/*.snapshot/**/*.template.json -linguist-generated
 **/*.snapshot/**/*DeployAssert*.template.json linguist-generated
+packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-big-response.js.snapshot/asset.3322b7049fb0ed2b7cbb644a2ada8d1116ff80c32dca89e6ada846b5de26f961.zip filter=lfs diff=lfs merge=lfs -text

packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts

@@ -13,7 +13,7 @@ import { shell, ShellOptions, ShellHelper, rimraf } from './shell';
 import { AwsContext, withAws } from './with-aws';
 import { withTimeout } from './with-timeout';
 
-export const DEFAULT_TEST_TIMEOUT_S = 10 * 60;
+export const DEFAULT_TEST_TIMEOUT_S = 20 * 60;
 export const EXTENDED_TEST_TIMEOUT_S = 30 * 60;
 
 /**

packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.160.0/skip-tests.txt

@@ -0,0 +1,2 @@
+# This test asserts too much about the output of the CLI.
+security related changes without a CLI are expected to fail when approval is required

packages/@aws-cdk-testing/cli-integ/skip-tests.txt

@@ -1,7 +1,7 @@
 # This file is empty on purpose. Leave it here as documentation
 # and an example.
 #
-# Copy this file to cli-regression-patches/vX.Y.Z/skip-tests.txt
+# Copy this file to resources/cli-regression-patches/vX.Y.Z/skip-tests.txt
 # and edit it there if you want to exclude certain tests from running
 # when performing a certain version's regression tests.
 #

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib.integtest.ts

@@ -75,7 +75,7 @@ integTest(
       'This deployment will make potentially sensitive changes according to your current security approval level',
     );
     expect(stdErr).toContain(
-      'Deployment failed: Error: "--require-approval" is enabled and stack includes security-sensitive updates',
+      '"--require-approval" is enabled and stack includes security-sensitive updates',
     );
 
     // Ensure stack was not deployed

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -19,7 +19,6 @@ import {
 import { InvokeCommand } from '@aws-sdk/client-lambda';
 import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns';
 import { AssumeRoleCommand, GetCallerIdentityCommand } from '@aws-sdk/client-sts';
-import * as chalk from 'chalk';
 import {
   integTest,
   cloneDirectory,
@@ -2185,7 +2184,7 @@ integTest(
 
 integTest(
   'hotswap deployment for ecs service detects failed deployment and errors',
-  withDefaultFixture(async (fixture) => {
+  withExtendedTimeoutFixture(async (fixture) => {
     // GIVEN
     await fixture.cdkDeploy('ecs-hotswap');
 
@@ -2198,8 +2197,7 @@ integTest(
       allowErrExit: true,
     });
 
-    const stackName = `${fixture.stackNamePrefix}-ecs-hotswap`;
-    const expectedSubstring = `❌  ${chalk.bold(stackName)} failed: ResourceNotReady: Resource is not in the state deploymentCompleted`;
+    const expectedSubstring = 'Resource is not in the state deploymentCompleted';
 
     expect(deployOutput).toContain(expectedSubstring);
     expect(deployOutput).not.toContain('hotswapped!');

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration.js.snapshot/aws-appconfig-configuration.template.json

@@ -780,7 +780,8 @@
      "Ref": "MyBucketF68F3FF0"
     },
     "RetainOnDelete": false,
-    "Prune": true
+    "Prune": true,
+    "OutputObjectKeys": true
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -917,7 +918,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "0158f40002a8c211635388a87874fd4dcc3d68f525fe08a0fe0f014069ae539c.zip"
+     "S3Key": "c6358465bf49dfae556bb430bf9c81fa578c221b82c308e3707901b1dd654762.zip"
     },
     "Environment": {
      "Variables": {

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-lambda-permission.graphql

@@ -0,0 +1,3 @@
+type Query {
+  getMessage: String
+}