Skip to content

Commit 7ba65a3

Browse files
author
vgkowski
committed
bump CDK and JSII versions
1 parent fda1a20 commit 7ba65a3

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
-177
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 & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +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';
8+
const CDK_VERSION = '2.208.0';
9+
const CDK_CLI_VERSION = '2.1023.0';
910
const CDK_CONSTRUCTS_VERSION = '10.4.2';
10-
const JSII_VERSION = '~5.6.0';
11-
const KUBECTL_LAYER_VERSION='v30';
11+
const JSII_VERSION = '~5.8.0';
12+
const KUBECTL_LAYER_VERSION='v33';
1213

1314
const repositoryUrl = 'https://github.com/awslabs/data-solutions-framework-on-aws.git';
1415
const homepage = 'https://awslabs.github.io/data-solutions-framework-on-aws/';
@@ -37,7 +38,7 @@ const rootProject = new LernaProject({
3738
'lerna-projen',
3839
'ts-node',
3940
'typescript',
40-
'glob@^10.3.6'
41+
'glob@^11.0.3'
4142
],
4243
peerDeps: [
4344
'@types/node@^16',
@@ -149,7 +150,7 @@ const fwkProject = new awscdk.AwsCdkConstructLibrary({
149150
'@jest/globals',
150151
'ts-jest',
151152
'jest-runner-groups',
152-
`@aws-cdk/cli-lib-alpha@${CDK_VERSION}-alpha.0`,
153+
`@aws-cdk/cli-lib-alpha@${CDK_CLI_VERSION}-alpha.0`,
153154
'rosetta',
154155
`@aws-cdk/lambda-layer-kubectl-${KUBECTL_LAYER_VERSION}`,
155156
'@types/eslint',
@@ -294,10 +295,10 @@ sparkDataLakeInfraExampleApp.addTask('test:e2e', {
294295
});
295296
const synthTask = sparkDataLakeInfraExampleApp.tasks.tryFind('synth:silent')!;
296297
synthTask.reset();
297-
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`);
298299
const buildExampleTask = sparkDataLakeInfraExampleApp.addTask('build-example', {
299300
steps: [
300-
{ 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` },
301302
{ spawn: 'synth:silent' },
302303
{ spawn: 'test:unit' },
303304
]
@@ -355,10 +356,10 @@ adsfQuickstart.addTask('test:e2e', {
355356
});
356357
const adsfQuickstartSynthTask = adsfQuickstart.tasks.tryFind('synth:silent')!;
357358
adsfQuickstartSynthTask.reset();
358-
adsfQuickstartSynthTask.exec(`npx aws-cdk@${CDK_VERSION} synth -q`);
359+
adsfQuickstartSynthTask.exec(`npx aws-cdk@${CDK_CLI_VERSION} synth -q`);
359360
const buildAdsfQuickstartTask = adsfQuickstart.addTask('build-example', {
360361
steps: [
361-
{ 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` },
362363
{ spawn: 'synth:silent' },
363364
{ spawn: 'test:unit' },
364365
]
@@ -418,10 +419,10 @@ opensearchQuickstart.addTask('test:e2e', {
418419

419420
const opensearchQuickstartSynthTask = opensearchQuickstart.tasks.tryFind('synth:silent')!;
420421
opensearchQuickstartSynthTask.reset();
421-
opensearchQuickstartSynthTask.exec(`npx aws-cdk@${CDK_VERSION} synth -q`);
422+
opensearchQuickstartSynthTask.exec(`npx aws-cdk@${CDK_CLI_VERSION} synth -q`);
422423
const buildOpensearchQuickstartTask = opensearchQuickstart.addTask('build-example', {
423424
steps: [
424-
{ 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` },
425426
{ spawn: 'synth:silent' },
426427
{ spawn: 'test:unit' },
427428
]
@@ -480,10 +481,10 @@ redshiftDataWarehouseExample.addTask('test:e2e', {
480481

481482
const redshiftDataWarehouseExampleSynthTask = redshiftDataWarehouseExample.tasks.tryFind('synth:silent')!;
482483
redshiftDataWarehouseExampleSynthTask.reset();
483-
redshiftDataWarehouseExampleSynthTask.exec(`npx aws-cdk@${CDK_VERSION} synth -q`);
484+
redshiftDataWarehouseExampleSynthTask.exec(`npx aws-cdk@${CDK_CLI_VERSION} synth -q`);
484485
const buildredshiftDataWarehouseExampleTask = redshiftDataWarehouseExample.addTask('build-example', {
485486
steps: [
486-
{ 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` },
487488
{ spawn: 'synth:silent' },
488489
{ spawn: 'test:unit' },
489490
]
@@ -509,7 +510,7 @@ const datazoneMskGovernance = new awscdk.AwsCdkPythonApp({
509510

510511
pytest: true,
511512
deps: [
512-
'aws-cdk.aws_lambda_python_alpha~=2.145.0a0'
513+
`aws-cdk.aws_lambda_python_alpha~=${CDK_VERSION}a0`
513514
],
514515
devDeps: [
515516
"pytest",
@@ -546,10 +547,10 @@ datazoneMskGovernance.addTask('test:e2e', {
546547
});
547548
const datazoneMskGovernanceSynthTask = datazoneMskGovernance.tasks.tryFind('synth:silent')!;
548549
datazoneMskGovernanceSynthTask.reset();
549-
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`);
550551
const buildDatazoneMskGovernanceTask = datazoneMskGovernance.addTask('build-example', {
551552
steps: [
552-
{ 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` },
553554
{ spawn: 'synth:silent' },
554555
{ spawn: 'test:unit' },
555556
]

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
@@ -30,8 +30,8 @@ cd datazone-msk-governance-example
3030
2. Modify the `./requirements.txt` to add the `cdklabs.aws_data_solutions_framework` library as a dependency:
3131

3232
```
33-
aws-cdk-lib==2.145.0
34-
aws-cdk.aws_lambda_python_alpha~=2.145.0a0
33+
aws-cdk-lib==2.208.0
34+
aws-cdk.aws_lambda_python_alpha~=2.208.0a0
3535
constructs>=10.3.0, <11.0.0
3636
cdklabs.aws_data_solutions_framework
3737
```

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)