Skip to content

Commit e136f61

Browse files
authored
chore: upgrade @aws-cdk/cloud-assembly-schema to v41.2.0 (#34369)
### Issue # (if applicable) N/A ### Reason for this change This upgrade is supposed to be done as part of #34362. But the `@aws-cdk/cloud-assembly-schema` upgrade requires a manual update to the unit test so I am isolating this upgrade to this PR. `v41.2.0` introduced a new line in the manifest file (PR: aws/aws-cdk-cli#184), hence, the unit test was failing. ### Description of changes Upgraded `@aws-cdk/cloud-assembly-schema` to `v41.2.0` and updated unit test. ### Describe any new or updated permissions being added None ### Description of how you validated changes Ran the build locally and no longer see the unit test failing ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 24a40a9 commit e136f61

File tree

7 files changed

+14
-8
lines changed

7 files changed

+14
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"license": "Apache-2.0",
8888
"devDependencies": {
8989
"@aws-cdk/cdk-build-tools": "0.0.0",
90-
"@aws-cdk/cloud-assembly-schema": "^41.0.0",
90+
"@aws-cdk/cloud-assembly-schema": "^41.2.0",
9191
"@aws-cdk/pkglint": "0.0.0",
9292
"@types/jest": "^29.5.14",
9393
"@types/mock-fs": "^4.13.4",

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ describe(IntegManifestSynthesizer, () => {
7272
// THEN
7373
expect(integManifest).toEqual({
7474
version: Manifest.version(),
75+
minimumCliVersion: Manifest.cliVersion(),
7576
testCases: {
7677
['Integ/DefaultTest']: {
7778
assertionStack: 'Integ/DefaultTest/DeployAssert',
@@ -111,6 +112,7 @@ describe(IntegManifestSynthesizer, () => {
111112
// THEN
112113
expect(integManifest).toEqual({
113114
version: Manifest.version(),
115+
minimumCliVersion: Manifest.cliVersion(),
114116
enableLookups: true,
115117
testCases: {
116118
['Integ/DefaultTest']: {
@@ -153,6 +155,7 @@ describe(IntegManifestSynthesizer, () => {
153155
// THEN
154156
expect(integManifest).toEqual({
155157
version: Manifest.version(),
158+
minimumCliVersion: Manifest.cliVersion(),
156159
testCases: {
157160
['Integ/DefaultTest']: {
158161
assertionStack: 'Integ/DefaultTest/DeployAssert',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ describe(IntegManifestWriter, () => {
3333

3434
const loaded = Manifest.loadIntegManifest(`${tmpDir}/integ.json`);
3535

36-
expect(loaded).toEqual({ ...manifest, version: Manifest.version() });
36+
expect(loaded).toEqual({ ...manifest, version: Manifest.version(), minimumCliVersion: Manifest.cliVersion() });
3737
});
3838

3939
it('writes manifests to the chosen location', () => {
4040
IntegManifestWriter.write(manifest, `${tmpDir}/custom-name.json`);
4141

4242
const loaded = Manifest.loadIntegManifest(`${tmpDir}/custom-name.json`);
4343

44-
expect(loaded).toEqual({ ...manifest, version: Manifest.version() });
44+
expect(loaded).toEqual({ ...manifest, version: Manifest.version(), minimumCliVersion: Manifest.cliVersion() });
4545
});
4646
});
4747

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ describe('synthesis', () => {
144144
expect(readJson(session.directory, 'foo.json')).toEqual({ bar: 123 });
145145
expect(session.manifest).toEqual({
146146
version: cxschema.Manifest.version(),
147+
minimumCliVersion: cxschema.Manifest.cliVersion(),
147148
artifacts: expect.objectContaining({
148149
'Tree': {
149150
type: 'cdk:tree',
@@ -203,6 +204,7 @@ describe('synthesis', () => {
203204
expect(readJson(session.directory, 'foo.json')).toEqual({ bar: 123 });
204205
expect(session.manifest).toEqual({
205206
version: cxschema.Manifest.version(),
207+
minimumCliVersion: cxschema.Manifest.cliVersion(),
206208
artifacts: expect.objectContaining({
207209
'Tree': {
208210
type: 'cdk:tree',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ test('cloud assembly builder', () => {
6969
// verify the manifest looks right
7070
expect(manifest).toStrictEqual({
7171
version: cxschema.Manifest.version(),
72+
minimumCliVersion: cxschema.Manifest.cliVersion(),
7273
missing: [
7374
{
7475
key: 'foo',

packages/aws-cdk-lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"dependencies": {
122122
"@aws-cdk/asset-awscli-v1": "^2.2.229",
123123
"@aws-cdk/asset-node-proxy-agent-v6": "^2.1.0",
124-
"@aws-cdk/cloud-assembly-schema": "^41.0.0",
124+
"@aws-cdk/cloud-assembly-schema": "^41.2.0",
125125
"@balena/dockerignore": "^1.0.2",
126126
"case": "1.6.3",
127127
"fs-extra": "^11.3.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
"@aws-cdk/service-spec-types" "^0.0.137"
7575
"@cdklabs/tskb" "^0.0.3"
7676

77-
"@aws-cdk/cloud-assembly-schema@^41.0.0":
78-
version "41.0.0"
79-
resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-41.0.0.tgz#0d6fc77dd22d78f181a462b89f769497c3898065"
80-
integrity sha512-Jgs3gelFN0Ghr5tbAhPxRsf78jKLGrMbUno4nXTGz3QiPkFqfrq0kodxmKP/IVSp55A5I3CsJ5QErQTit39GdA==
77+
"@aws-cdk/cloud-assembly-schema@^41.2.0":
78+
version "41.2.0"
79+
resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-41.2.0.tgz#c1ef513e1cc0528dbc05948ae39d5631306af423"
80+
integrity sha512-JaulVS6z9y5+u4jNmoWbHZRs9uGOnmn/ktXygNWKNu1k6lF3ad4so3s18eRu15XCbUIomxN9WPYT6Ehh7hzONw==
8181
dependencies:
8282
jsonschema "~1.4.1"
8383
semver "^7.7.1"

0 commit comments

Comments
 (0)