Merge branch 'main' into merge-back/2.58.1

Author: mergify[bot]

packages/@aws-cdk-containers/ecs-service-extensions/test/publish-subscribe.integ.snapshot/aws-ecs-integ.template.json

@@ -27,6 +27,11 @@ RUN mkdir /tmp/yarn-cache && \
     chmod -R 777 /tmp/yarn-cache && \
     yarn config set cache-folder /tmp/yarn-cache
 
+# Ensure all users can write to pnpm cache
+RUN mkdir /tmp/pnpm-cache && \
+    chmod -R 777 /tmp/pnpm-cache && \
+    pnpm config --global set store-dir /tmp/pnpm-cache
+
 # Disable npm update notifications
 RUN npm config --global set update-notifier false
 

packages/@aws-cdk/aws-lambda-nodejs/lib/Dockerfile

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Architecture, AssetCode, Code, Runtime } from '@aws-cdk/aws-lambda';
 import * as cdk from '@aws-cdk/core';
 import { PackageInstallation } from './package-installation';
-import { PackageManager } from './package-manager';
+import { LockFile, PackageManager } from './package-manager';
 import { BundlingOptions, OutputFormat, SourceMapMode } from './types';
 import { exec, extractDependencies, findUp, getTsconfigCompilerOptions } from './util';
 
@@ -229,12 +229,16 @@ export class Bundling implements cdk.BundlingOptions {
 
       const lockFilePath = pathJoin(options.inputDir, this.relativeDepsLockFilePath ?? this.packageManager.lockFile);
 
+      const isPnpm = this.packageManager.lockFile === LockFile.PNPM;
+
       // Create dummy package.json, copy lock file if any and then install
       depsCommand = chain([
+        isPnpm ? osCommand.write(pathJoin(options.outputDir, 'pnpm-workspace.yaml'), ''): '', // Ensure node_modules directory is installed locally by creating local 'pnpm-workspace.yaml' file
         osCommand.writeJson(pathJoin(options.outputDir, 'package.json'), { dependencies }),
         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
       ]);
     }
 
@@ -310,13 +314,20 @@ interface BundlingCommandOptions {
 class OsCommand {
   constructor(private readonly osPlatform: NodeJS.Platform) {}
 
-  public writeJson(filePath: string, data: any): string {
-    const stringifiedData = JSON.stringify(data);
+  public write(filePath: string, data: string): string {
     if (this.osPlatform === 'win32') {
-      return `echo ^${stringifiedData}^ > "${filePath}"`;
+      if (!data) { // if `data` is empty, echo a blank line, otherwise the file will contain a `^` character
+        return `echo. > "${filePath}"`;
+      }
+      return `echo ^${data}^ > "${filePath}"`;
     }
 
-    return `echo '${stringifiedData}' > "${filePath}"`;
+    return `echo '${data}' > "${filePath}"`;
+  }
+
+  public writeJson(filePath: string, data: any): string {
+    const stringifiedData = JSON.stringify(data);
+    return this.write(filePath, stringifiedData);
   }
 
   public copy(src: string, dest: string): string {
@@ -330,6 +341,14 @@ class OsCommand {
   public changeDirectory(dir: string): string {
     return `cd "${dir}"`;
   }
+
+  public remove(filePath: string): string {
+    if (this.osPlatform === 'win32') {
+      return `del "${filePath}"`;
+    }
+
+    return `rm "${filePath}"`;
+  }
 }
 
 /**

packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts

@@ -51,16 +51,16 @@ export interface NodejsFunctionProps extends lambda.FunctionOptions {
   readonly awsSdkConnectionReuse?: boolean;
 
   /**
-   * The path to the dependencies lock file (`yarn.lock` or `package-lock.json`).
+   * The path to the dependencies lock file (`yarn.lock`, `pnpm-lock.yaml` or `package-lock.json`).
    *
    * This will be used as the source for the volume mounted in the Docker
    * container.
    *
    * Modules specified in `nodeModules` will be installed using the right
-   * installer (`npm` or `yarn`) along with this lock file.
+   * installer (`yarn`, `pnpm` or `npm`) along with this lock file.
    *
    * @default - the path is found by walking up parent directories searching for
-   *   a `yarn.lock` or `package-lock.json` file
+   *   a `yarn.lock`, `pnpm-lock.yaml` or `package-lock.json` file
    */
   readonly depsLockFilePath?: string;
 

packages/@aws-cdk/aws-lambda-nodejs/lib/function.ts

@@ -39,7 +39,9 @@ export class PackageManager {
       case LockFile.PNPM:
         return new PackageManager({
           lockFile: LockFile.PNPM,
-          installCommand: logLevel && logLevel !== LogLevel.INFO ? ['pnpm', 'install', '--reporter', 'silent'] : ['pnpm', 'install'],
+          installCommand: logLevel && logLevel !== LogLevel.INFO ? ['pnpm', 'install', '--reporter', 'silent', '--config.node-linker=hoisted', '--config.package-import-method=clone-or-copy'] : ['pnpm', 'install', '--config.node-linker=hoisted', '--config.package-import-method=clone-or-copy'],
+          // --config.node-linker=hoisted to create flat node_modules without symlinks
+          // --config.package-import-method=clone-or-copy to avoid hardlinking packages from the store
           runCommand: ['pnpm', 'exec'],
           argsSeparator: '--',
         });

packages/@aws-cdk/aws-lambda-nodejs/lib/package-manager.ts

@@ -247,7 +247,7 @@ export interface BundlingOptions extends DockerRunOptions {
    * A custom bundling Docker image.
    *
    * This image should have esbuild installed globally. If you plan to use `nodeModules`
-   * it should also have `npm` or `yarn` depending on the lock file you're using.
+   * it should also have `npm`, `yarn` or `pnpm` depending on the lock file you're using.
    *
    * See https://github.com/aws/aws-cdk/blob/main/packages/%40aws-cdk/aws-lambda-nodejs/lib/Dockerfile
    * for the default image provided by @aws-cdk/aws-lambda-nodejs.

packages/@aws-cdk/aws-lambda-nodejs/lib/types.ts

@@ -78,6 +78,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/integ-tests": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
+    "@aws-cdk/triggers": "0.0.0",
     "@types/jest": "^27.5.2",
     "delay": "5.0.0",
     "esbuild": "^0.16.6"

packages/@aws-cdk/aws-lambda-nodejs/package.json

@@ -408,7 +408,7 @@ test('Detects pnpm-lock.yaml', () => {
     assetHashType: AssetHashType.OUTPUT,
     bundling: expect.objectContaining({
       command: expect.arrayContaining([
-        expect.stringMatching(/pnpm-lock\.yaml.+pnpm install/),
+        expect.stringMatching(/echo '' > "\/asset-output\/pnpm-workspace.yaml\".+pnpm-lock\.yaml.+pnpm install --config.node-linker=hoisted --config.package-import-method=clone-or-copy && rm "\/asset-output\/node_modules\/.modules.yaml"/),
       ]),
     }),
   });

packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts

@@ -58,6 +58,7 @@ test('cache folders have the right permissions', () => {
     'bash', '-c', [
       'stat -c \'%a\' /tmp/npm-cache',
       'stat -c \'%a\' /tmp/yarn-cache',
+      'stat -c \'%a\' /tmp/pnpm-cache',
     ].join(' &&  '),
   ]);
   expect(proc.stdout.toString()).toMatch('777\n777');

packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts

@@ -0,0 +1,6 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import axios from 'axios';
+
+export async function handler() {
+  await axios.get('https://www.google.com');
+}

packages/@aws-cdk/aws-lambda-nodejs/test/integ-handlers/pnpm/dependencies-pnpm.ts

@@ -0,0 +1,19 @@
+{
+  "version": "22.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "PnpmTestDefaultTestDeployAssert397EDF83.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}

packages/@aws-cdk/aws-lambda-nodejs/test/integ-handlers/pnpm/pnpm-lock.yaml

@@ -0,0 +1,36 @@
+{
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}

packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.assets.json

@@ -0,0 +1,45 @@
+{
+  "version": "22.0.0",
+  "files": {
+    "58d2406e0a74fd42ac31e584a098bb581709c3de7bff389451c2a08db50c4383": {
+      "source": {
+        "path": "asset.58d2406e0a74fd42ac31e584a098bb581709c3de7bff389451c2a08db50c4383",
+        "packaging": "zip"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "58d2406e0a74fd42ac31e584a098bb581709c3de7bff389451c2a08db50c4383.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
+    "44fdff138ed916c94d14f276217febea5c4a2e1746518f7f620c37b22a6675b8": {
+      "source": {
+        "path": "asset.44fdff138ed916c94d14f276217febea5c4a2e1746518f7f620c37b22a6675b8",
+        "packaging": "zip"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "44fdff138ed916c94d14f276217febea5c4a2e1746518f7f620c37b22a6675b8.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
+    "c51cd09452e746f11796192b2e9025f8c82de145d16aeb2e2c66c2197ecbae26": {
+      "source": {
+        "path": "TestStack.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "c51cd09452e746f11796192b2e9025f8c82de145d16aeb2e2c66c2197ecbae26.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}