Skip to content

Commit 07d8ae5

Browse files
author
vgkowski
committed
bump CDK and JSII versions
1 parent e9d71c5 commit 07d8ae5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+421
-179
lines changed

.projen/deps.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ import { Transform } from "projen/lib/javascript";
55
import { dirname } from 'path';
66
import { globSync } from 'glob';
77

8-
const CDK_VERSION = '2.178.2';
9-
// Alpha lib is only used in examples, not in the framework
10-
const CDK_ALPHA_VERSION = '2.178.0a0';
8+
const CDK_VERSION = '2.208.0';
9+
const CDK_CLI_VERSION = '2.1023.0';
1110
const CDK_CONSTRUCTS_VERSION = '10.4.2';
12-
const JSII_VERSION = '~5.6.0';
13-
const KUBECTL_LAYER_VERSION='v30';
11+
const JSII_VERSION = '~5.8.0';
12+
const KUBECTL_LAYER_VERSION='v33';
1413

1514
const repositoryUrl = 'https://github.com/awslabs/data-solutions-framework-on-aws.git';
1615
const homepage = 'https://awslabs.github.io/data-solutions-framework-on-aws/';
@@ -39,7 +38,7 @@ const rootProject = new LernaProject({
3938
'lerna-projen',
4039
'ts-node',
4140
'typescript',
42-
'glob@^10.3.6'
41+
'glob@^11.0.3'
4342
],
4443
peerDeps: [
4544
'@types/node@^16',
@@ -151,7 +150,7 @@ const fwkProject = new awscdk.AwsCdkConstructLibrary({
151150
'@jest/globals',
152151
'ts-jest',
153152
'jest-runner-groups',
154-
`@aws-cdk/cli-lib-alpha@${CDK_VERSION}-alpha.0`,
153+
`@aws-cdk/cli-lib-alpha@${CDK_CLI_VERSION}-alpha.0`,
155154
'rosetta',
156155
`@aws-cdk/lambda-layer-kubectl-${KUBECTL_LAYER_VERSION}`,
157156
'@types/eslint',
@@ -296,10 +295,10 @@ sparkDataLakeInfraExampleApp.addTask('test:e2e', {
296295
});
297296
const synthTask = sparkDataLakeInfraExampleApp.tasks.tryFind('synth:silent')!;
298297
synthTask.reset();
299-
synthTask.exec(`npx aws-cdk@${CDK_VERSION} synth -q -c prod=PLACEHOLDER -c staging=PLACEHOLDER`);
298+
synthTask.exec(`npx aws-cdk@${CDK_CLI_VERSION} synth -q -c prod=PLACEHOLDER -c staging=PLACEHOLDER`);
300299
const buildExampleTask = sparkDataLakeInfraExampleApp.addTask('build-example', {
301300
steps: [
302-
{ exec: `pip install --ignore-installed --no-cache-dir --no-deps --no-index --find-links ../../../framework/dist/python cdklabs.aws_data_solutions_framework` },
301+
{ exec: `pip install --force-reinstall --no-cache-dir --no-deps --no-index --find-links ../../../framework/dist/python cdklabs.aws_data_solutions_framework` },
303302
{ spawn: 'synth:silent' },
304303
{ spawn: 'test:unit' },
305304
]
@@ -357,10 +356,10 @@ adsfQuickstart.addTask('test:e2e', {
357356
});
358357
const adsfQuickstartSynthTask = adsfQuickstart.tasks.tryFind('synth:silent')!;
359358
adsfQuickstartSynthTask.reset();
360-
adsfQuickstartSynthTask.exec(`npx aws-cdk@${CDK_VERSION} synth -q`);
359+
adsfQuickstartSynthTask.exec(`npx aws-cdk@${CDK_CLI_VERSION} synth -q`);
361360
const buildAdsfQuickstartTask = adsfQuickstart.addTask('build-example', {
362361
steps: [
363-
{ exec: `pip install --ignore-installed --no-deps --no-cache-dir --no-index --find-links ../../framework/dist/python cdklabs.aws_data_solutions_framework` },
362+
{ exec: `pip install --force-reinstall --no-deps --no-cache-dir --no-index --find-links ../../framework/dist/python cdklabs.aws_data_solutions_framework` },
364363
{ spawn: 'synth:silent' },
365364
{ spawn: 'test:unit' },
366365
]
@@ -420,10 +419,10 @@ opensearchQuickstart.addTask('test:e2e', {
420419

421420
const opensearchQuickstartSynthTask = opensearchQuickstart.tasks.tryFind('synth:silent')!;
422421
opensearchQuickstartSynthTask.reset();
423-
opensearchQuickstartSynthTask.exec(`npx aws-cdk@${CDK_VERSION} synth -q`);
422+
opensearchQuickstartSynthTask.exec(`npx aws-cdk@${CDK_CLI_VERSION} synth -q`);
424423
const buildOpensearchQuickstartTask = opensearchQuickstart.addTask('build-example', {
425424
steps: [
426-
{ exec: `pip install --ignore-installed --no-deps --no-cache-dir --no-index --find-links ../../framework/dist/python cdklabs.aws_data_solutions_framework` },
425+
{ exec: `pip install --force-reinstall --no-deps --no-cache-dir --no-index --find-links ../../framework/dist/python cdklabs.aws_data_solutions_framework` },
427426
{ spawn: 'synth:silent' },
428427
{ spawn: 'test:unit' },
429428
]
@@ -482,10 +481,10 @@ redshiftDataWarehouseExample.addTask('test:e2e', {
482481

483482
const redshiftDataWarehouseExampleSynthTask = redshiftDataWarehouseExample.tasks.tryFind('synth:silent')!;
484483
redshiftDataWarehouseExampleSynthTask.reset();
485-
redshiftDataWarehouseExampleSynthTask.exec(`npx aws-cdk@${CDK_VERSION} synth -q`);
484+
redshiftDataWarehouseExampleSynthTask.exec(`npx aws-cdk@${CDK_CLI_VERSION} synth -q`);
486485
const buildredshiftDataWarehouseExampleTask = redshiftDataWarehouseExample.addTask('build-example', {
487486
steps: [
488-
{ exec: `pip install --ignore-installed --no-deps --no-cache-dir --no-index --find-links ../../framework/dist/python cdklabs.aws_data_solutions_framework` },
487+
{ exec: `pip install --force-reinstall --no-deps --no-cache-dir --no-index --find-links ../../framework/dist/python cdklabs.aws_data_solutions_framework` },
489488
{ spawn: 'synth:silent' },
490489
{ spawn: 'test:unit' },
491490
]
@@ -511,7 +510,7 @@ const datazoneMskGovernance = new awscdk.AwsCdkPythonApp({
511510

512511
pytest: true,
513512
deps: [
514-
`aws-cdk.aws_lambda_python_alpha~=${CDK_ALPHA_VERSION}`
513+
`aws-cdk.aws_lambda_python_alpha~=${CDK_VERSION}a0`
515514
],
516515
devDeps: [
517516
"pytest",
@@ -548,10 +547,10 @@ datazoneMskGovernance.addTask('test:e2e', {
548547
});
549548
const datazoneMskGovernanceSynthTask = datazoneMskGovernance.tasks.tryFind('synth:silent')!;
550549
datazoneMskGovernanceSynthTask.reset();
551-
datazoneMskGovernanceSynthTask.exec(`DOMAIN_ID=2222 DATAZONE_PORTAL_ROLE_NAME=admin npx aws-cdk@${CDK_VERSION} synth -q`);
550+
datazoneMskGovernanceSynthTask.exec(`DOMAIN_ID=2222 DATAZONE_PORTAL_ROLE_NAME=admin npx aws-cdk@${CDK_CLI_VERSION} synth -q`);
552551
const buildDatazoneMskGovernanceTask = datazoneMskGovernance.addTask('build-example', {
553552
steps: [
554-
{ exec: `pip install --ignore-installed --no-deps --no-index --find-links ../../framework/dist/python cdklabs.aws_data_solutions_framework` },
553+
{ exec: `pip install --force-reinstall --no-deps --no-index --find-links ../../framework/dist/python cdklabs.aws_data_solutions_framework` },
555554
{ spawn: 'synth:silent' },
556555
{ spawn: 'test:unit' },
557556
]

examples/datazone-msk-governance/.projen/deps.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/datazone-msk-governance/.projen/tasks.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/datazone-msk-governance/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ cd datazone-msk-governance-example
2828
2. Modify the `./requirements.txt` to add the `cdklabs.aws_data_solutions_framework` library as a dependency:
2929

3030
```
31-
aws-cdk-lib==2.178.0
32-
aws-cdk.aws_lambda_python_alpha~=2.178.0a0
31+
aws-cdk-lib==2.208.0
32+
aws-cdk.aws_lambda_python_alpha~=2.208.0a0
3333
constructs>=10.3.0, <11.0.0
3434
cdklabs.aws_data_solutions_framework
3535
```

examples/datazone-msk-governance/requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/datazone-msk-governance/requirements.txt

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/dsf-quickstart/.projen/deps.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/dsf-quickstart/.projen/tasks.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/dsf-quickstart/requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)