Merge branch 'main' into add-maharaj-haider

Author: paulhcsun

.github/workflows/github-merit-badger.yml

@@ -17,4 +17,4 @@ jobs:
           badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
           thresholds: '[0,3,6,13,25,50]'
           badge-type: 'achievement'
-          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,aws-cdk-automation,dependabot[bot],mergify[bot],maharajhaider,aemada-aws]'
+          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,astiwana,maharajhaider,aws-cdk-automation,dependabot[bot],mergify[bot],aemada-aws]'

.mergify.yml

@@ -65,7 +65,7 @@ pull_request_rules:
       label:
         add: [contribution/core]
     conditions:
-      - author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|moelasmar|paulhcsun|GavinZZ|xazhao|gracelu0|shikha372|QuantumNeuralCoder|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|jiayiwang7|saiyush|5d|iankhou|SimonCMoore|maharajhaider|Y-JayKim|ykethan|aemada-aws)$
+      - author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|moelasmar|paulhcsun|GavinZZ|xazhao|gracelu0|shikha372|QuantumNeuralCoder|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|jiayiwang7|saiyush|5d|iankhou|SimonCMoore|maharajhaider|Y-JayKim|astiwana|ykethan|aemada-aws)$
       - -label~="contribution/core"
   - name: automatic merge
     actions:

packages/@aws-cdk/cx-api/package.json

@@ -87,7 +87,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/cdk-build-tools": "0.0.0",
-    "@aws-cdk/cloud-assembly-schema": "^41.0.0",
+    "@aws-cdk/cloud-assembly-schema": "^41.2.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.14",
     "@types/mock-fs": "^4.13.4",

packages/@aws-cdk/integ-tests-alpha/test/manifest-synthesizer.test.ts

@@ -72,6 +72,7 @@ describe(IntegManifestSynthesizer, () => {
     // THEN
     expect(integManifest).toEqual({
       version: Manifest.version(),
+      minimumCliVersion: Manifest.cliVersion(),
       testCases: {
         ['Integ/DefaultTest']: {
           assertionStack: 'Integ/DefaultTest/DeployAssert',
@@ -111,6 +112,7 @@ describe(IntegManifestSynthesizer, () => {
     // THEN
     expect(integManifest).toEqual({
       version: Manifest.version(),
+      minimumCliVersion: Manifest.cliVersion(),
       enableLookups: true,
       testCases: {
         ['Integ/DefaultTest']: {
@@ -153,6 +155,7 @@ describe(IntegManifestSynthesizer, () => {
     // THEN
     expect(integManifest).toEqual({
       version: Manifest.version(),
+      minimumCliVersion: Manifest.cliVersion(),
       testCases: {
         ['Integ/DefaultTest']: {
           assertionStack: 'Integ/DefaultTest/DeployAssert',

packages/@aws-cdk/integ-tests-alpha/test/manifest-writer.test.ts

@@ -33,15 +33,15 @@ describe(IntegManifestWriter, () => {
 
     const loaded = Manifest.loadIntegManifest(`${tmpDir}/integ.json`);
 
-    expect(loaded).toEqual({ ...manifest, version: Manifest.version() });
+    expect(loaded).toEqual({ ...manifest, version: Manifest.version(), minimumCliVersion: Manifest.cliVersion() });
   });
 
   it('writes manifests to the chosen location', () => {
     IntegManifestWriter.write(manifest, `${tmpDir}/custom-name.json`);
 
     const loaded = Manifest.loadIntegManifest(`${tmpDir}/custom-name.json`);
 
-    expect(loaded).toEqual({ ...manifest, version: Manifest.version() });
+    expect(loaded).toEqual({ ...manifest, version: Manifest.version(), minimumCliVersion: Manifest.cliVersion() });
   });
 });
 

packages/aws-cdk-lib/core/test/synthesis.test.ts

@@ -144,6 +144,7 @@ describe('synthesis', () => {
     expect(readJson(session.directory, 'foo.json')).toEqual({ bar: 123 });
     expect(session.manifest).toEqual({
       version: cxschema.Manifest.version(),
+      minimumCliVersion: cxschema.Manifest.cliVersion(),
       artifacts: expect.objectContaining({
         'Tree': {
           type: 'cdk:tree',
@@ -203,6 +204,7 @@ describe('synthesis', () => {
     expect(readJson(session.directory, 'foo.json')).toEqual({ bar: 123 });
     expect(session.manifest).toEqual({
       version: cxschema.Manifest.version(),
+      minimumCliVersion: cxschema.Manifest.cliVersion(),
       artifacts: expect.objectContaining({
         'Tree': {
           type: 'cdk:tree',

packages/aws-cdk-lib/cx-api/test/cloud-assembly-builder.test.ts

@@ -69,6 +69,7 @@ test('cloud assembly builder', () => {
   // verify the manifest looks right
   expect(manifest).toStrictEqual({
     version: cxschema.Manifest.version(),
+    minimumCliVersion: cxschema.Manifest.cliVersion(),
     missing: [
       {
         key: 'foo',

packages/aws-cdk-lib/package.json

@@ -121,7 +121,7 @@
   "dependencies": {
     "@aws-cdk/asset-awscli-v1": "^2.2.229",
     "@aws-cdk/asset-node-proxy-agent-v6": "^2.1.0",
-    "@aws-cdk/cloud-assembly-schema": "^41.0.0",
+    "@aws-cdk/cloud-assembly-schema": "^41.2.0",
     "@balena/dockerignore": "^1.0.2",
     "case": "1.6.3",
     "fs-extra": "^11.3.0",

yarn.lock

@@ -74,10 +74,10 @@
     "@aws-cdk/service-spec-types" "^0.0.137"
     "@cdklabs/tskb" "^0.0.3"
 
-"@aws-cdk/cloud-assembly-schema@^41.0.0":
-  version "41.0.0"
-  resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-41.0.0.tgz#0d6fc77dd22d78f181a462b89f769497c3898065"
-  integrity sha512-Jgs3gelFN0Ghr5tbAhPxRsf78jKLGrMbUno4nXTGz3QiPkFqfrq0kodxmKP/IVSp55A5I3CsJ5QErQTit39GdA==
+"@aws-cdk/cloud-assembly-schema@^41.2.0":
+  version "41.2.0"
+  resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-41.2.0.tgz#c1ef513e1cc0528dbc05948ae39d5631306af423"
+  integrity sha512-JaulVS6z9y5+u4jNmoWbHZRs9uGOnmn/ktXygNWKNu1k6lF3ad4so3s18eRu15XCbUIomxN9WPYT6Ehh7hzONw==
   dependencies:
     jsonschema "~1.4.1"
     semver "^7.7.1"