Skip to content

Commit

Permalink
fix(lambda-nodejs): pnpm no longer supports nodejs14.x (#24821)
Browse files Browse the repository at this point in the history
Doing a couple of things
- Update `Dockerfile` image to nodejs18
- Pin pnpm to 8.0.0 (latest version)
- Add some error handling to the test to better catch this error in the future

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

(cherry picked from commit b1c9ab2)

# Conflicts:
#	packages/@aws-cdk/aws-lambda-destinations/test/destinations.integ.snapshot/asset.1bc7cf3a01a7153f942391263b3bac937812996cc28f9abaf83ffebbbe03e38b.bundle/index.js
#	packages/@aws-cdk/aws-lambda-nodejs/test/compilations.integ.snapshot/integ.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/compilations.integ.snapshot/tree.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/dependencies.integ.snapshot/asset.9ea9c0b2e771d6d3cf404fc942748e905e9680505b2b07f5fa83e13d5d6490d3/node_modules/.yarn-integrity
#	packages/@aws-cdk/aws-lambda-nodejs/test/dependencies.integ.snapshot/asset.9ea9c0b2e771d6d3cf404fc942748e905e9680505b2b07f5fa83e13d5d6490d3/node_modules/delay/index.d.ts
#	packages/@aws-cdk/aws-lambda-nodejs/test/dependencies.integ.snapshot/asset.9ea9c0b2e771d6d3cf404fc942748e905e9680505b2b07f5fa83e13d5d6490d3/node_modules/delay/index.js
#	packages/@aws-cdk/aws-lambda-nodejs/test/dependencies.integ.snapshot/asset.9ea9c0b2e771d6d3cf404fc942748e905e9680505b2b07f5fa83e13d5d6490d3/node_modules/delay/license
#	packages/@aws-cdk/aws-lambda-nodejs/test/dependencies.integ.snapshot/asset.9ea9c0b2e771d6d3cf404fc942748e905e9680505b2b07f5fa83e13d5d6490d3/node_modules/delay/package.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/dependencies.integ.snapshot/asset.9ea9c0b2e771d6d3cf404fc942748e905e9680505b2b07f5fa83e13d5d6490d3/node_modules/delay/readme.md
#	packages/@aws-cdk/aws-lambda-nodejs/test/dependencies.integ.snapshot/asset.9ea9c0b2e771d6d3cf404fc942748e905e9680505b2b07f5fa83e13d5d6490d3/package.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/dependencies.integ.snapshot/asset.9ea9c0b2e771d6d3cf404fc942748e905e9680505b2b07f5fa83e13d5d6490d3/yarn.lock
#	packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.compilations.js.snapshot/cdk-integ-compilations-lambda-nodejs.template.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.compilations.js.snapshot/manifest.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.template.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/asset.92ec9d050245fd270cf2b0df478b31f140ba820c3407e964246946bcea933a19.bundle/index.js
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/cdk.out
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/integ.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/manifest.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/tree.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/LambdaDependenciesDefaultTestDeployAssert259C940B.assets.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/LambdaDependenciesDefaultTestDeployAssert259C940B.template.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/index.js
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/node_modules/.yarn-integrity
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/node_modules/delay/index.d.ts
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/node_modules/delay/index.js
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/node_modules/delay/license
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/node_modules/delay/package.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/node_modules/delay/readme.md
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/package.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.50a8879346510e33e69a511e29d588e7b2d2b477b6989a4db677027bb8605b9f/yarn.lock
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.92ec9d050245fd270cf2b0df478b31f140ba820c3407e964246946bcea933a19.bundle/index.js
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.b54b99043c35bd080b9d9d1afce31e3541cf15b679799ba980ed40c837dcb03b.bundle/index.js
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.f078d47ca35d3ee8cf531975a21ac17857ee7d4afc2c1a5a01ccc8b597b9ba88/node_modules/.yarn-integrity
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.f078d47ca35d3ee8cf531975a21ac17857ee7d4afc2c1a5a01ccc8b597b9ba88/node_modules/delay/index.d.ts
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.f078d47ca35d3ee8cf531975a21ac17857ee7d4afc2c1a5a01ccc8b597b9ba88/node_modules/delay/index.js
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.f078d47ca35d3ee8cf531975a21ac17857ee7d4afc2c1a5a01ccc8b597b9ba88/node_modules/delay/license
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.f078d47ca35d3ee8cf531975a21ac17857ee7d4afc2c1a5a01ccc8b597b9ba88/node_modules/delay/package.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.f078d47ca35d3ee8cf531975a21ac17857ee7d4afc2c1a5a01ccc8b597b9ba88/node_modules/delay/readme.md
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.f078d47ca35d3ee8cf531975a21ac17857ee7d4afc2c1a5a01ccc8b597b9ba88/package.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/asset.f078d47ca35d3ee8cf531975a21ac17857ee7d4afc2c1a5a01ccc8b597b9ba88/yarn.lock
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/cdk-integ-lambda-nodejs-dependencies-for-sdk-v3.assets.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/cdk-integ-lambda-nodejs-dependencies.template.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/cdk.out
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/integ.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/manifest.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.js.snapshot/tree.json
#	packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.ts
#	packages/@aws-cdk/aws-lambda/test/bundling.integ.snapshot/BundlingDefaultTestDeployAssertAACA0CAF.template.json
#	packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.assets.json
#	packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/PipelineStack.assets.json
#	packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.assets.json
#	packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/PipelineStack.assets.json
  • Loading branch information
corymhall authored and mergify[bot] committed Mar 28, 2023
1 parent 8b26382 commit 065b737
Show file tree
Hide file tree
Showing 269 changed files with 49,095 additions and 56 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"20.0.0"}
{"version":"31.0.0"}
Loading

0 comments on commit 065b737

Please sign in to comment.