Merge from aws/aws-sam-cli/develop

aws-sam-cli-bot · web-flow · commit cccd1d82cbe7 · 2025-05-21T09:53:33.000-07:00
diff --git a/.github/workflows/need-attention-label.yml b/.github/workflows/need-attention-label.yml
diff --git a/Makefile b/Makefile
@@ -63,21 +63,21 @@ pr: init dev schema black-check
 # to consider combining these files again
 update-reproducible-linux-reqs:
 	python3.11 -m venv venv-update-reproducible-linux
-	venv-update-reproducible-linux/bin/pip install --upgrade pip-tools pip
+	venv-update-reproducible-linux/bin/pip install pip==24.0 pip-tools==7.4.1
 	venv-update-reproducible-linux/bin/pip install -r requirements/base.txt
 	venv-update-reproducible-linux/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-linux.txt
 
 update-reproducible-mac-reqs:
 	python3.11 -m venv venv-update-reproducible-mac
-	venv-update-reproducible-mac/bin/pip install --upgrade pip-tools pip
+	venv-update-reproducible-mac/bin/pip install pip==24.0 pip-tools==7.4.1
 	venv-update-reproducible-mac/bin/pip install -r requirements/base.txt
 	venv-update-reproducible-mac/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-mac.txt
 
 # note that this should be run on a windows environment with python3.8 as default interpreter
 update-reproducible-win-reqs:
 	python -m venv venv-update-reproducible-win
 	.\venv-update-reproducible-win\Scripts\activate
-	python.exe -m pip install --upgrade pip-tools pip
+	python.exe -m pip install pip==24.0 pip-tools==7.4.1
 	pip install -r requirements\base.txt
 	pip-compile --generate-hashes --allow-unsafe -o requirements\reproducible-win.txt
 
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,5 +1,5 @@
 chevron~=0.12
-click~=8.1
+click==8.1.8
 Flask<3.2
 boto3>=1.29.2,<2
 jmespath~=1.0.1
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -15,7 +15,7 @@ types-pywin32==308.0.0.20241221; python_version<"3.9"
 types-PyYAML==6.0.12.20250402
 types-chevron==0.14.2.20250103
 types-psutil==7.0.0.20250401
-types-setuptools==80.0.0.20250429
+types-setuptools==80.3.0.20250505
 types-Pygments==2.19.0.20250305 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20250408
@@ -35,8 +35,8 @@ pytest==8.3.5
 parameterized==0.9.0
 pytest-xdist==3.6.1
 pytest-forked==1.6.0
-pytest-timeout==2.3.1
-pytest-rerunfailures==15.0;  python_version>="3.9"
+pytest-timeout==2.4.0
+pytest-rerunfailures==15.1;  python_version>="3.9"
 pytest-rerunfailures==14.0;  python_version<"3.9"
 # NOTE (hawflau): DO NOT upgrade pytest-metadata and pytest-json-report unless pytest-json-report addresses https://github.com/numirias/pytest-json-report/issues/89
 pytest-metadata==3.1.1
diff --git a/requirements/pre-dev.txt b/requirements/pre-dev.txt
@@ -1 +1 @@
-ruff==0.11.7
+ruff==0.11.8
diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
@@ -248,9 +248,9 @@ chevron==0.14.0 \
     --hash=sha256:87613aafdf6d77b6a90ff073165a61ae5086e21ad49057aa0e53681601800ebf \
     --hash=sha256:fbf996a709f8da2e745ef763f482ce2d311aa817d287593a5b990d6d6e4f0443
     # via aws-sam-cli (setup.py)
-click==8.1.7 \
-    --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
-    --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
+click==8.1.8 \
+    --hash=sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2 \
+    --hash=sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a
     # via
     #   aws-sam-cli (setup.py)
     #   cookiecutter
diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
@@ -248,9 +248,9 @@ chevron==0.14.0 \
     --hash=sha256:87613aafdf6d77b6a90ff073165a61ae5086e21ad49057aa0e53681601800ebf \
     --hash=sha256:fbf996a709f8da2e745ef763f482ce2d311aa817d287593a5b990d6d6e4f0443
     # via aws-sam-cli (setup.py)
-click==8.1.7 \
-    --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
-    --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
+click==8.1.8 \
+    --hash=sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2 \
+    --hash=sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a
     # via
     #   aws-sam-cli (setup.py)
     #   cookiecutter
diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt
@@ -248,9 +248,9 @@ chevron==0.14.0 \
     --hash=sha256:87613aafdf6d77b6a90ff073165a61ae5086e21ad49057aa0e53681601800ebf \
     --hash=sha256:fbf996a709f8da2e745ef763f482ce2d311aa817d287593a5b990d6d6e4f0443
     # via aws-sam-cli (setup.py)
-click==8.1.7 \
-    --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
-    --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
+click==8.1.8 \
+    --hash=sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2 \
+    --hash=sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a
     # via
     #   aws-sam-cli (setup.py)
     #   cookiecutter
diff --git a/samcli/__init__.py b/samcli/__init__.py
@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.138.0"
+__version__ = "1.139.0"
diff --git a/samcli/cli/command.py b/samcli/cli/command.py
@@ -7,6 +7,7 @@
 from collections import OrderedDict
 
 import click
+from click import Group
 
 from samcli.cli.formatters import RootCommandHelpTextFormatter
 from samcli.cli.root.command_list import SAM_CLI_COMMANDS
@@ -37,7 +38,7 @@
 ]
 
 
-class BaseCommand(click.MultiCommand):
+class BaseCommand(Group):
     """
     Dynamically loads commands. It takes a list of names of Python packages representing the commands, loads
     these packages, and initializes them as Click commands. If a command "hello" is available in a Python package
@@ -244,7 +245,7 @@ def list_commands(self, ctx):
 
     def get_command(self, ctx, cmd_name):
         """
-        Overrides method from ``click.MultiCommand`` that returns Click CLI object for given command name, if found.
+        Overrides method from ``Group`` that returns Click CLI object for given command name, if found.
 
         :param ctx: Click context
         :param cmd_name: Top-level command name
diff --git a/samcli/commands/deploy/command.py b/samcli/commands/deploy/command.py
@@ -36,7 +36,7 @@
 )
 from samcli.commands.deploy.core.command import DeployCommand
 from samcli.commands.deploy.utils import sanitize_parameter_overrides
-from samcli.lib.bootstrap.bootstrap import manage_stack
+from samcli.lib.bootstrap.bootstrap import manage_stack, print_managed_s3_bucket_info
 from samcli.lib.bootstrap.companion_stack.companion_stack_manager import sync_ecr_stack
 from samcli.lib.cli_validation.image_repository_validation import image_repository_validation
 from samcli.lib.telemetry.metric import track_command
@@ -307,9 +307,7 @@ def do_cli(
             if bool(s3_bucket):
                 raise DeployResolveS3AndS3SetError()
             s3_bucket = manage_stack(profile=profile, region=region)
-            click.echo(f"\n\t\tManaged S3 bucket: {s3_bucket}")
-            click.echo("\t\tA different default S3 bucket can be set in samconfig.toml")
-            click.echo("\t\tOr by specifying --s3-bucket explicitly.")
+            print_managed_s3_bucket_info(s3_bucket)
 
         # TODO Refactor resolve-s3 and resolve-image-repos into one place
         # after we figure out how to enable resolve-images-repos in package
diff --git a/samcli/commands/deploy/guided_context.py b/samcli/commands/deploy/guided_context.py
@@ -23,7 +23,7 @@
 from samcli.commands.deploy.exceptions import GuidedDeployFailedError
 from samcli.commands.deploy.guided_config import GuidedConfig
 from samcli.commands.deploy.utils import sanitize_parameter_overrides
-from samcli.lib.bootstrap.bootstrap import manage_stack
+from samcli.lib.bootstrap.bootstrap import manage_stack, print_managed_s3_bucket_info
 from samcli.lib.bootstrap.companion_stack.companion_stack_manager import CompanionStackManager, sync_ecr_stack
 from samcli.lib.config.samconfig import DEFAULT_CONFIG_FILE_NAME, DEFAULT_ENV
 from samcli.lib.intrinsic_resolver.intrinsics_symbol_table import IntrinsicsSymbolTable
@@ -182,11 +182,7 @@ def guided_prompts(self, parameter_override_keys):
 
         click.echo("\n\tLooking for resources needed for deployment:")
         managed_s3_bucket = manage_stack(profile=self.profile, region=region)
-        click.secho(f"\n\tManaged S3 bucket: {managed_s3_bucket}", bold=True)
-        click.echo(
-            "\tA different default S3 bucket can be set in samconfig.toml"
-            " and auto resolution of buckets turned off by setting resolve_s3=False"
-        )
+        print_managed_s3_bucket_info(managed_s3_bucket)
 
         image_repositories = (
             sync_ecr_stack(
diff --git a/samcli/commands/docs/core/command.py b/samcli/commands/docs/core/command.py
@@ -5,7 +5,7 @@
 import os
 from typing import List, Optional
 
-from click import Command, Context, MultiCommand, style
+from click import Command, Context, Group, style
 
 from samcli.cli.row_modifiers import RowDefinition
 from samcli.commands.docs.command_context import COMMAND_NAME, DocsCommandContext
@@ -90,19 +90,19 @@ def format_options(self, ctx: Context, formatter: DocsCommandHelpTextFormatter):
         self.format_sub_commands(formatter)
 
 
-class DocsSubCommand(MultiCommand):
-    def __init__(self, command: Optional[List[str]] = None, *args, **kwargs):
+class DocsSubCommand(Group):
+    def __init__(self, command_list: Optional[List[str]] = None, *args, **kwargs):
         """
         Constructor for instantiating a sub-command for the docs command
 
         Parameters
         ----------
-        command: Optional[List[str]]
+        command_list: Optional[List[str]]
             Optional list of strings representing the fully resolved command name (e.g. ["docs", "local", "invoke"])
         """
         super().__init__(*args, **kwargs)
         self.docs_command = DocsCommandContext()
-        self.command = command or self.docs_command.sub_commands
+        self.command_list = command_list or self.docs_command.sub_commands.copy()
         self.command_string = self.docs_command.sub_command_string
         self.command_callback = self.docs_command.command_callback
 
@@ -127,14 +127,19 @@ def get_command(self, ctx: Context, cmd_name: str) -> Command:
             or the leaf command to be invoked by the command handler
 
         """
-        next_command = self.command.pop(0)
-        if not self.command:
+        if not self.command_list:
+            return None  # type: ignore # This is expected by Click's interface
+
+        next_command = self.command_list[0]
+        remaining_commands = self.command_list[1:] if len(self.command_list) > 1 else []
+
+        if not remaining_commands:
             return DocsBaseCommand(
                 name=next_command,
                 short_help=f"Documentation for {self.command_string}",
                 callback=self.command_callback,
             )
-        return DocsSubCommand(command=self.command)
+        return DocsSubCommand(command_list=remaining_commands)
 
     def list_commands(self, ctx: Context) -> List[str]:
         """
diff --git a/samcli/commands/local/generate_event/event_generation.py b/samcli/commands/local/generate_event/event_generation.py
@@ -5,6 +5,7 @@
 import functools
 
 import click
+from click import Group
 
 from samcli.cli.cli_config_file import ConfigProvider, configuration_option
 from samcli.cli.options import debug_option
@@ -13,7 +14,7 @@
 from samcli.lib.utils.version_checker import check_newer_version
 
 
-class ServiceCommand(click.MultiCommand):
+class ServiceCommand(Group):
     """
     Top level command that defines the service provided
 
@@ -83,7 +84,7 @@ def list_commands(self, ctx):
         return sorted(self.all_cmds.keys())
 
 
-class EventTypeSubCommand(click.MultiCommand):
+class EventTypeSubCommand(Group):
     """
     Class that describes the commands underneath a given service type
 
diff --git a/samcli/commands/package/command.py b/samcli/commands/package/command.py
@@ -23,7 +23,7 @@
     use_json_option,
 )
 from samcli.commands.package.core.command import PackageCommand
-from samcli.lib.bootstrap.bootstrap import manage_stack
+from samcli.lib.bootstrap.bootstrap import manage_stack, print_managed_s3_bucket_info
 from samcli.lib.cli_validation.image_repository_validation import image_repository_validation
 from samcli.lib.telemetry.metric import track_command, track_template_warnings
 from samcli.lib.utils.resources import resources_generator
@@ -168,9 +168,7 @@ def do_cli(
 
     if resolve_s3:
         s3_bucket = manage_stack(profile=profile, region=region)
-        click.echo(f"\n\t\tManaged S3 bucket: {s3_bucket}")
-        click.echo("\t\tA different default S3 bucket can be set in samconfig.toml")
-        click.echo("\t\tOr by specifying --s3-bucket explicitly.")
+        print_managed_s3_bucket_info(s3_bucket)
 
     with PackageContext(
         template_file=template_file,
diff --git a/samcli/lib/bootstrap/bootstrap.py b/samcli/lib/bootstrap/bootstrap.py
@@ -7,6 +7,7 @@
 from typing import Optional
 
 import boto3
+import click
 from botocore.exceptions import ClientError
 
 from samcli import __version__
@@ -35,6 +36,22 @@ def manage_stack(profile, region):
     return bucket_name
 
 
+def print_managed_s3_bucket_info(s3_bucket: str):
+    """
+    Print information about the managed S3 bucket.
+
+    Parameters
+    ----------
+    s3_bucket : str
+        The name of the managed S3 bucket
+    """
+    message = f"\n\tManaged S3 bucket: {s3_bucket}"
+    click.secho(message, bold=True)
+    click.echo("\tAuto resolution of buckets can be turned off by setting resolve_s3=False")
+    click.echo("\tTo use a specific S3 bucket, set --s3-bucket=<bucket_name>")
+    click.echo("\tAbove settings can be stored in samconfig.toml")
+
+
 def get_current_account_id(profile: Optional[str] = None):
     """Returns account ID based on used AWS credentials."""
     session = boto3.Session(profile_name=profile)
diff --git a/samcli/lib/package/s3_uploader.py b/samcli/lib/package/s3_uploader.py
@@ -85,7 +85,7 @@ def upload(self, file_name: str, remote_path: str) -> str:
 
         # Check if a file with same data exists
         if not self.force_upload and self.file_exists(remote_path):
-            LOG.info("File with same data already exists at %s, skipping upload", remote_path)
+            LOG.info("\n\tFile with same data already exists at %s, skipping upload", remote_path)
             return self.make_url(remote_path)
 
         try:
diff --git a/samcli/lib/utils/async_utils.py b/samcli/lib/utils/async_utils.py
@@ -131,7 +131,11 @@ def run_async(self, default_executor: bool = True) -> list:
         List of result of the executions in order
         """
         event_loop = new_event_loop()
-        if not default_executor:
-            with ThreadPoolExecutor() as self.executor:
-                return run_given_tasks_async(self._async_tasks, event_loop, self.executor)
-        return run_given_tasks_async(self._async_tasks, event_loop)
+        try:
+            if not default_executor:
+                with ThreadPoolExecutor() as self.executor:
+                    return run_given_tasks_async(self._async_tasks, event_loop, self.executor)
+            return run_given_tasks_async(self._async_tasks, event_loop)
+        finally:
+            # Close the event loop to prevent memory leaks
+            event_loop.close()
diff --git a/samcli/local/apigw/local_apigw_service.py b/samcli/local/apigw/local_apigw_service.py
@@ -19,6 +19,7 @@
 from samcli.lib.providers.provider import Api, Cors
 from samcli.lib.telemetry.event import EventName, EventTracker, UsedFeature
 from samcli.lib.utils.stream_writer import StreamWriter
+from samcli.local.apigw.authorizers.authorizer import Authorizer
 from samcli.local.apigw.authorizers.lambda_authorizer import LambdaAuthorizer
 from samcli.local.apigw.event_constructor import construct_v1_event, construct_v2_event_http
 from samcli.local.apigw.exceptions import (
@@ -652,7 +653,7 @@ def _request_handler(self, **kwargs):
         request_origin = request.headers.get("Origin")
         cors_headers = Cors.cors_to_headers(self.api.cors, request_origin, route.event_type)
 
-        lambda_authorizer = route.authorizer_object
+        lambda_authorizer: Optional[Authorizer] = route.authorizer_object
 
         # payloadFormatVersion can only support 2 values: "1.0" and "2.0"
         # so we want to do strict validation to make sure it has proper value if provided
diff --git a/samcli/local/rapid/aws-lambda-rie-arm64 b/samcli/local/rapid/aws-lambda-rie-arm64
diff --git a/samcli/local/rapid/aws-lambda-rie-x86_64 b/samcli/local/rapid/aws-lambda-rie-x86_64
diff --git a/tests/unit/cli/test_command.py b/tests/unit/cli/test_command.py
@@ -1,7 +1,6 @@
 from contextlib import contextmanager
 
-import click
-
+from click import Group
 from unittest import TestCase
 from unittest.mock import Mock, patch, call
 from samcli.cli.command import BaseCommand
@@ -59,7 +58,7 @@ def setUp(self):
 
     def test_must_inherit(self):
         cmd = BaseCommand()
-        self.assertTrue(isinstance(cmd, click.MultiCommand))
+        self.assertTrue(isinstance(cmd, Group))
 
     def test_check_formatter(self):
         cmd = BaseCommand()
diff --git a/tests/unit/commands/docs/core/test_command.py b/tests/unit/commands/docs/core/test_command.py
@@ -36,13 +36,13 @@ def test_formatter(self):
 class TestDocsSubCommand(TestCase):
     def test_get_command_with_sub_commands(self):
         command = ["local", "invoke"]
-        sub_command = DocsSubCommand(command=command)
+        sub_command = DocsSubCommand(command_list=command)
         resolved_command = sub_command.get_command(ctx=None, cmd_name="local")
         self.assertTrue(isinstance(resolved_command, DocsSubCommand))
 
     def test_get_command_with_base_command(self):
         command = ["local"]
-        sub_command = DocsSubCommand(command=command)
+        sub_command = DocsSubCommand(command_list=command)
         resolved_command = sub_command.get_command(ctx=None, cmd_name="local")
         self.assertTrue(isinstance(resolved_command, DocsBaseCommand))
 
