Merge branch 'main' into comcalvi/order-dependent-logical-IDs

.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/tests/cli-integ-tests/cli.integtest.ts

@@ -2259,3 +2259,34 @@ integTest(
     expect(noticesUnacknowledged).toEqual(noticesUnacknowledgedAlias);
   }),
 );
+
+integTest('cdk notices for bootstrap', withDefaultFixture(async (fixture) => {
+
+  const cache = {
+    expiration: 4125963264000, // year 2100 so we never overwrite the cache
+    notices: [{
+      title: 'Bootstrap stack outdated',
+      issueNumber: 16600,
+      overview: 'Your environments "{resolve:ENVIRONMENTS}" are running an outdated bootstrap stack.',
+      components: [{
+        name: 'bootstrap',
+        version: '<2000',
+      }],
+      schemaVersion: '1',
+    }],
+  };
+
+  const cdkCacheDir = path.join(fixture.integTestDir, 'cache');
+  await fs.mkdir(cdkCacheDir);
+  await fs.writeFile(path.join(cdkCacheDir, 'notices.json'), JSON.stringify(cache));
+
+  const output = await fixture.cdkDeploy('test-2', {
+    verbose: false,
+    modEnv: {
+      CDK_HOME: fixture.integTestDir,
+    },
+  });
+
+  expect(output).toContain('Your environments \"aws://');
+
+}));

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": {