Merge branch 'main' into main

CONTRIBUTING.md

@@ -485,16 +485,14 @@ CDK integration tests.
 
 ### Step 4: Pull Request
 
-* Create a commit with your changes and push them to a
-  [fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
+* Create a [fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) of the CDK repository.
+* Create a new branch for your change, and push the change commits on it.
   > [!IMPORTANT]
-  > We will not be able to accept your contribution if you do not allow commits to your PR branch, as it introduces
-  > friction in our review process and breaks our automation that syncs with the main branch. In these scenarios, we will close
-  > your pull request and ask that you recreate it with the necessary permissions.
-  > This means that you must contribute from a fork within your personal account (as opposed to an organization owned account) and also develop
-  > your contribution on a branch other than `main`. See
-  > [Allowing changes to a pull request branch created from a fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)
-  > for more information.
+  > Your pull request must be based off of a branch in a personal account (not an organization owned account, and not the `main` branch).
+  > You must also have the setting enabled that [allows the CDK team to push changes to your branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) (this setting is enabled by default for personal accounts,
+  > and cannot be enabled for organization owned accounts).
+  > The reason for this is that our automation needs to synchronize your branch with our `main` after it has been approved, and
+  > we cannot do that if we cannot push to your branch.
   
   > [!NOTE]
   > CDK core members can push to a branch on the AWS CDK repo (naming convention: `<user>/<feature-bug-name>`).

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.subscriptionfilter.ts

@@ -25,12 +25,7 @@ class SubscriptionFilterIntegStack extends Stack {
 }
 
 const app = new App();
-const testCase = new SubscriptionFilterIntegStack(app, 'aws-cdk-subscriptionfilter-integ', {
-  env: {
-    account: process.env.CDK_INTEG_ACCOUNT || process.env.CDK_DEFAULT_ACCOUNT,
-    region: process.env.CDK_INTEG_REGION || process.env.CDK_DEFAULT_REGION,
-  },
-});
+const testCase = new SubscriptionFilterIntegStack(app, 'aws-cdk-subscriptionfilter-integ');
 
 new IntegTest(app, 'integ-test', {
   testCases: [testCase],

packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-file-system-locations.js.snapshot/PipelinesFileSystemLocations.template.json

@@ -805,7 +805,7 @@
         },
         "OutputArtifacts": [
          {
-          "Name": "c81125c577cddc5477d274144695873cfd8965e6a0_Source"
+          "Name": "c81125c577cddc5477d274144695873cfd8965e6a0_key_Source"
          }
         ],
         "RoleArn": {
@@ -835,7 +835,7 @@
         },
         "InputArtifacts": [
          {
-          "Name": "c81125c577cddc5477d274144695873cfd8965e6a0_Source"
+          "Name": "c81125c577cddc5477d274144695873cfd8965e6a0_key_Source"
          }
         ],
         "Name": "Synth",