Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/common-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,18 @@ jobs:
working-directory: test/cdk-basic
- name: Test YAML
run: npx vitest --retry 2 test/cdk-basic.test.ts
# Repeat the tests with the previous version of aws-cdk-lib
# to validate the code injection into aws-cdk-lib works with both versions
# Remove package-lock.json first: it still contains entries for the workspaces removed
# by prepareForTest.js, which confuses npm and leaves aws-cdk-lib uninstalled
- name: Install previous CDK version
run: |
rm package-lock.json
npm i aws-cdk@2.1124.1 aws-cdk-lib@2.257.0 constructs@10.6.0 -w test/cdk-basic
- name: Test - previous CDK version
run: npx vitest --retry 2 test/cdk-basic.test.ts
- name: Test - previous CDK version - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 2 test/cdk-basic.test.ts

test-cdk-esm:
runs-on: ubuntu-latest
Expand Down
1,482 changes: 700 additions & 782 deletions package-lock.json

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,41 +92,41 @@
"@types/aws-iot-device-sdk": "^2.2.9",
"@types/eslint-config-prettier": "^6.11.3",
"@types/inquirer": "^9.0.9",
"@types/node": "^25.9.1",
"@types/node": "^25.9.2",
"@types/serverless": "^3.12.28",
"aws-cdk": "2.1124.1",
"aws-cdk-lib": "2.257.0",
"aws-cdk": "2.1126.0",
"aws-cdk-lib": "2.258.1",
"constructs": "^10.6.0",
"eslint": "^10.4.0",
"eslint": "^10.4.1",
"eslint-config-prettier": "^10.1.8",
"globals": "^17.6.0",
"husky": "^9.1.7",
"osls": "^3.72.0",
"prettier": "^3.8.3",
"osls": "^3.74.0",
"prettier": "^3.8.4",
"semantic-release": "^25.0.3",
"serverless": "^3.38.0",
"serverless-esbuild": "^1.57.2",
"tsx": "^4.22.3",
"typescript-eslint": "^8.59.4",
"tsx": "^4.22.4",
"typescript-eslint": "^8.61.0",
"vitepress": "^1.6.4",
"vitest": "^4.1.7"
"vitest": "^4.1.8"
},
"dependencies": {
"@aws-sdk/client-cloudformation": "^3.1053.0",
"@aws-sdk/client-iam": "^3.1053.0",
"@aws-sdk/client-iot": "^3.1053.0",
"@aws-sdk/client-iot-data-plane": "^3.1053.0",
"@aws-sdk/client-lambda": "^3.1053.0",
"@aws-sdk/client-s3": "^3.1053.0",
"@aws-sdk/credential-providers": "^3.1053.0",
"@smithy/shared-ini-file-loader": "^4.5.4",
"@aws-sdk/client-cloudformation": "^3.1065.0",
"@aws-sdk/client-iam": "^3.1065.0",
"@aws-sdk/client-iot": "^3.1065.0",
"@aws-sdk/client-iot-data-plane": "^3.1065.0",
"@aws-sdk/client-lambda": "^3.1065.0",
"@aws-sdk/client-s3": "^3.1065.0",
"@aws-sdk/credential-providers": "^3.1065.0",
"@smithy/shared-ini-file-loader": "^4.5.6",
"aws-iot-device-sdk": "^2.2.16",
"chalk": "^5.6.2",
"chokidar": "^3.6.0",
"commander": "^14.0.3",
"commander": "^15.0.0",
"esbuild": "^0.28.0",
"fast-xml-parser": "^5.8.0",
"inquirer": "^13.4.3",
"inquirer": "^14.0.2",
"jsonc-parser": "^3.3.1",
"node-machine-id": "^1.1.12",
"toml": "^4.1.1",
Expand Down
8 changes: 4 additions & 4 deletions src/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@types/aws-lambda": "^8.10.161"
"@types/aws-lambda": "^8.10.162"
},
"dependencies": {
"@aws-sdk/client-iot": "^3.1053.0",
"@aws-sdk/client-lambda": "^3.1053.0",
"@aws-sdk/client-s3": "^3.1053.0",
"@aws-sdk/client-iot": "^3.1065.0",
"@aws-sdk/client-lambda": "^3.1065.0",
"@aws-sdk/client-s3": "^3.1065.0",
"aws-iot-device-sdk": "^2.2.16"
}
}
10 changes: 6 additions & 4 deletions src/frameworks/cdkFramework.ts
Original file line number Diff line number Diff line change
Expand Up @@ -383,12 +383,14 @@ export class CdkFramework implements IFramework {
) {
// prevent initializing Docker if esbuild is no installed
// Docker is used for bundling if esbuild is not installed, but it is not needed at this point
const origCode =
'const shouldBuildImage=props.forceDockerBundling||!Bundling.esbuildInstallation;';
// The class is named "Bundling" in aws-cdk-lib <= 2.257 and "Bundling2" in >= 2.258
// (renamed by the decorator transform), so match both with a regex.
const origCodeRegex =
/const shouldBuildImage=props\.forceDockerBundling\|\|!Bundling\d*\.esbuildInstallation;/;
const replaceCode = 'const shouldBuildImage=false;';

if (contents.includes(origCode)) {
contents = contents.replace(origCode, replaceCode);
if (origCodeRegex.test(contents)) {
contents = contents.replace(origCodeRegex, replaceCode);
} else {
throw new Error(
`Can not find code to inject in ${args.path} to prevent initializing Docker`,
Expand Down
10 changes: 5 additions & 5 deletions test/cdk-basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
"destroy": "cdk destroy --all -c environment=test --force"
},
"devDependencies": {
"@types/node": "25.9.1",
"@types/node": "25.9.2",
"@tsconfig/node24": "^24.0.4",
"aws-cdk": "2.1124.1",
"aws-cdk": "2.1126.0",
"ts-node": "^10.9.2",
"typescript": "~6.0.3",
"@types/aws-lambda": "^8.10.161"
"@types/aws-lambda": "^8.10.162"
},
"dependencies": {
"aws-cdk-lib": "2.257.0",
"aws-cdk-lib": "2.258.1",
"constructs": "^10.6.0",
"source-map-support": "^0.5.21",
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-basic/services/testJsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "commonjs",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-basic/services/testJsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "module",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-basic/services/testTsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-basic/services/testTsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
10 changes: 5 additions & 5 deletions test/cdk-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
"destroy": "cdk destroy -c environment=check --force"
},
"devDependencies": {
"@types/node": "25.9.1",
"@types/node": "25.9.2",
"@tsconfig/node24": "^24.0.4",
"aws-cdk": "2.1124.1",
"aws-cdk": "2.1126.0",
"ts-node": "^10.9.2",
"typescript": "~6.0.3",
"@types/aws-lambda": "^8.10.161"
"@types/aws-lambda": "^8.10.162"
},
"dependencies": {
"aws-cdk-lib": "2.257.0",
"aws-cdk-lib": "2.258.1",
"constructs": "^10.6.0",
"source-map-support": "^0.5.21",
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-config/services/testJsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "commonjs",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-config/services/testJsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "module",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-config/services/testTsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-config/services/testTsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "commonjs",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "module",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
12 changes: 6 additions & 6 deletions test/cdk-esm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
},
"devDependencies": {
"@tsconfig/node24": "^24.0.4",
"@types/aws-lambda": "^8.10.161",
"@types/node": "25.9.1",
"aws-cdk": "2.1124.1",
"@types/aws-lambda": "^8.10.162",
"@types/node": "25.9.2",
"aws-cdk": "2.1126.0",
"ts-node": "^10.9.2",
"tsx": "^4.22.3",
"tsx": "^4.22.4",
"typescript": "~6.0.3"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0",
"aws-cdk-lib": "2.257.0",
"@aws-sdk/client-sts": "^3.1065.0",
"aws-cdk-lib": "2.258.1",
"constructs": "^10.6.0",
"source-map-support": "^0.5.21"
}
Expand Down
2 changes: 1 addition & 1 deletion test/cdk-esm/services/testJsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "commonjs",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-esm/services/testJsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "module",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-esm/services/testTsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-esm/services/testTsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
10 changes: 5 additions & 5 deletions test/cdk-nested/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
"destroy": "cdk destroy --all -c environment=test --force"
},
"devDependencies": {
"@types/node": "25.9.1",
"@types/node": "25.9.2",
"@tsconfig/node24": "^24.0.4",
"aws-cdk": "2.1124.1",
"aws-cdk": "2.1126.0",
"ts-node": "^10.9.2",
"typescript": "~6.0.3",
"@types/aws-lambda": "^8.10.161"
"@types/aws-lambda": "^8.10.162"
},
"dependencies": {
"aws-cdk-lib": "2.257.0",
"aws-cdk-lib": "2.258.1",
"constructs": "^10.6.0",
"source-map-support": "^0.5.21",
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-nested/services/testJsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "commonjs",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-nested/services/testJsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "module",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-nested/services/testTsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/cdk-nested/services/testTsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@tsconfig/node24": "^24.0.4"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
4 changes: 2 additions & 2 deletions test/opentofu-basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@types/aws-lambda": "^8.10.161"
"@types/aws-lambda": "^8.10.162"
},
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/opentofu-basic/services/testJsCommonJs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "commonjs",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
2 changes: 1 addition & 1 deletion test/opentofu-basic/services/testJsEsModule/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"type": "module",
"dependencies": {
"@aws-sdk/client-sts": "^3.1053.0"
"@aws-sdk/client-sts": "^3.1065.0"
}
}
Loading
Loading