more tests

aws · May 20, 2021 · 7ab655c · 7ab655c
1 parent e37701f
commit 7ab655c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts b/packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts
@@ -231,6 +231,27 @@ test('Detects yarn.lock', () => {
   });
 });
 
+test('Detects pnpm-lock.yaml', () => {
+  const pnpmLock = '/project/pnpm-lock.yaml';
+  Bundling.bundle({
+    entry: __filename,
+    depsLockFilePath: pnpmLock,
+    runtime: Runtime.NODEJS_12_X,
+    nodeModules: ['delay'],
+    forceDockerBundling: true,
+  });
+
+  // Correctly bundles with esbuild
+  expect(Code.fromAsset).toHaveBeenCalledWith(path.dirname(pnpmLock), {
+    assetHashType: AssetHashType.OUTPUT,
+    bundling: expect.objectContaining({
+      command: expect.arrayContaining([
+        expect.stringMatching(/pnpm-lock\.yaml.+pnpm install/),
+      ]),
+    }),
+  });
+});
+
 test('with Docker build args', () => {
   Bundling.bundle({
     entry,

diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts b/packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts
@@ -39,6 +39,19 @@ test('can yarn install with non root user', () => {
   expect(proc.status).toEqual(0);
 });
 
+test('can pnpm install with non root user', () => {
+  const proc = spawnSync('docker', [
+    'run', '-u', '500:500',
+    'esbuild',
+    'bash', '-c', [
+      'mkdir /tmp/test',
+      'cd /tmp/test',
+      'pnpm add constructs',
+    ].join(' && '),
+  ]);
+  expect(proc.status).toEqual(0);
+});
+
 test('cache folders have the right permissions', () => {
   const proc = spawnSync('docker', [
     'run', 'esbuild',