Merge branch 'main' into 8461-lookup-ecr

Author: mergify[bot]

packages/@aws-cdk-testing/framework-integ/package.json

@@ -30,7 +30,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/cdk-build-tools": "0.0.0",
-    "@aws-cdk/integ-runner": "2.186.0",
+    "@aws-cdk/integ-runner": "^2.186.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@aws-sdk/client-acm": "3.632.0",
     "@aws-sdk/client-rds": "3.632.0",

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

@@ -883,7 +883,7 @@
           "Name": "Synth_Output"
          }
         ],
-        "Name": "FileAsset1",
+        "Name": "Asset",
         "RoleArn": {
          "Fn::GetAtt": [
           "PipelineCodeBuildActionRole226DB0CB",
@@ -1732,7 +1732,7 @@
     "Cache": {
      "Type": "NO_CACHE"
     },
-    "Description": "Pipeline step PipelinesFileSystemLocations/Pipeline/Assets/FileAsset1",
+    "Description": "Pipeline step PipelinesFileSystemLocations/Pipeline/Assets/Asset",
     "EncryptionKey": "alias/aws/s3",
     "Environment": {
      "ComputeType": "BUILD_GENERAL1_SMALL",