Merge from aws/aws-sam-cli/develop

Author: aws-sam-tooling-bot[bot]

.github/workflows/codeql.yml

@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4.38.2
+      uses: github/codeql-action/init@v4.39.1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4.38.2
+      uses: github/codeql-action/autobuild@v4.39.1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4.38.2
+      uses: github/codeql-action/analyze@v4.39.1
       with:
         category: "/language:${{matrix.language}}"

pyproject.toml

@@ -45,7 +45,7 @@ dependencies = [
     "docker>=7.1,<7.3",
     "dateparser~=1.3",
     "requests>=2.32.5,<2.35.0",
-    "aws_lambda_builders==1.67.0",
+    "aws_lambda_builders==1.68.0",
     "tomlkit==0.15.1",
     "watchdog==4.0.2",
     "rich>=14.3.3,<15.1.0",

requirements/reproducible-linux.txt

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.170.0"
+__version__ = "1.171.0"

requirements/reproducible-mac.txt

@@ -57,6 +57,7 @@ class ExperimentalFlag:
     UvPackageManager = ExperimentalEntry(
         "experimentalUvPackageManager", EXPERIMENTAL_ENV_VAR_PREFIX + "UV_PACKAGE_MANAGER"
     )
+    NodejsMonorepo = ExperimentalEntry("experimentalNodejsMonorepo", EXPERIMENTAL_ENV_VAR_PREFIX + "NODEJS_MONOREPO")
 
 
 def is_experimental_enabled(config_entry: ExperimentalEntry) -> bool:

requirements/reproducible-win.txt

@@ -1053,7 +1053,17 @@ def build_in_source_click_option():
         required=False,
         is_flag=True,
         help="Opts in to build project in the source folder. The following workflows support "
-        f"building in source: {SUPPORTED_BUILD_IN_SOURCE_WORKFLOWS}",
+        f"building in source: {SUPPORTED_BUILD_IN_SOURCE_WORKFLOWS}\n"
+        "\n"
+        "For `sam build` on an npm workspaces monorepo, npm installs once at the workspace root "
+        "instead of once per function, and each function's artifacts are narrowed to the "
+        "dependencies it resolves. The install runs in the workspace root npm itself reports, "
+        "which is inside your project but above the function's CodeUri.\n"
+        "\n"
+        "This grouping is in beta: enable it with --beta-features or "
+        "SAM_CLI_BETA_NODEJS_MONOREPO=1. Without it, every function installs for itself, as in "
+        "earlier releases. It is also skipped for --use-container and --cached builds, so "
+        "`sam sync` does not use it.",
         cls=ClickMutex,
         incompatible_params=["use_container", "hook_name"],
     )

samcli/__init__.py

@@ -159,7 +159,7 @@ def __init__(
         docker_network: Optional[str]
             Docker network to run the container in.
         skip_pull_image: bool
-            Whether we should pull new Docker container image or not
+            Whether we should pull new container image or not
         container_env_var: Optional[dict]
             An optional dictionary of environment variables to pass to the container
         container_env_var_file: Optional[dict]

samcli/commands/_utils/experimental.py

@@ -74,6 +74,18 @@ def format_examples(ctx: Context, formatter: CommandHelpTextFormatter):
                         ),
                     ]
                 )
+            with formatter.indented_section(
+                name="Build an npm workspaces monorepo, installing once at the workspace root (beta)",
+                extra_indents=1,
+            ):
+                formatter.write_text_rows(
+                    [
+                        RowDefinition(
+                            name=style(f"$ {ctx.command_path} --build-in-source --beta-features"),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ]
+                )
             with formatter.indented_section(name="Build sam project and deploy", extra_indents=1):
                 formatter.write_text_rows(
                     [