fix(lambda): bundling error with pnpm 8.4.0+ where .modules.yaml doesn’t exist (#25612)

damienhill · damienhill · commit fa1d8be5532d · 2023-07-17T16:44:18.000+10:00
Added -f flag when removing node_modules/.modules.yaml from output dir as part of ES Build bundling step to support both pnpm 8.3.1 and below behaviour where this file is always generated and 8.4.0 and above where this file is not generated if no node_modules exist.

Signed-off-by: Damien Hill &lt;damien@damienhill.com&gt;
diff --git a/packages/aws-cdk-lib/aws-lambda-nodejs/lib/bundling.ts b/packages/aws-cdk-lib/aws-lambda-nodejs/lib/bundling.ts
@@ -245,7 +245,7 @@ export class Bundling implements cdk.BundlingOptions {
         osCommand.copy(lockFilePath, pathJoin(options.outputDir, this.packageManager.lockFile)),
         osCommand.changeDirectory(options.outputDir),
         this.packageManager.installCommand.join(' '),
-        isPnpm ? osCommand.remove(pathJoin(options.outputDir, 'node_modules', '.modules.yaml')) : '', // Remove '.modules.yaml' file which changes on each deployment
+        isPnpm ? osCommand.remove(pathJoin(options.outputDir, 'node_modules', '.modules.yaml')) + ' -f' : '', // Remove '.modules.yaml' file which changes on each deployment
       ]);
     }
 
diff --git a/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts b/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts
@@ -432,7 +432,7 @@ test('Detects pnpm-lock.yaml', () => {
     assetHashType: AssetHashType.OUTPUT,
     bundling: expect.objectContaining({
       command: expect.arrayContaining([
-        expect.stringMatching(/echo '' > "\/asset-output\/pnpm-workspace.yaml\".+pnpm-lock\.yaml.+pnpm install --config.node-linker=hoisted --config.package-import-method=clone-or-copy --no-prefer-frozen-lockfile && rm "\/asset-output\/node_modules\/.modules.yaml"/),
+        expect.stringMatching(/echo '' > "\/asset-output\/pnpm-workspace.yaml\".+pnpm-lock\.yaml.+pnpm install --config.node-linker=hoisted --config.package-import-method=clone-or-copy --no-prefer-frozen-lockfile && rm "\/asset-output\/node_modules\/.modules.yaml" -f/),
       ]),
     }),
   });

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ export class Bundling implements cdk.BundlingOptions {`
`245`	`245`	`osCommand.copy(lockFilePath, pathJoin(options.outputDir, this.packageManager.lockFile)),`
`246`	`246`	`osCommand.changeDirectory(options.outputDir),`
`247`	`247`	`this.packageManager.installCommand.join(' '),`
`248`		`- isPnpm ? osCommand.remove(pathJoin(options.outputDir, 'node_modules', '.modules.yaml')) : '', // Remove '.modules.yaml' file which changes on each deployment`
	`248`	`+ isPnpm ? osCommand.remove(pathJoin(options.outputDir, 'node_modules', '.modules.yaml')) + ' -f' : '', // Remove '.modules.yaml' file which changes on each deployment`
`249`	`249`	`]);`
`250`	`250`	`}`
`251`	`251`