chore(workflow) Remove deprecated workflow (#8022)

* remove deprecated workflow

* fix make issue related to click version

* Update reproducibles: update-reproducible-linux-reqs

* Update reproducibles: update-reproducible-mac-reqs

* Update reproducibles: update-reproducible-win-reqs

---------

Co-authored-by: GitHub Action <action@github.com>

Author: vicheey

.github/workflows/need-attention-label.yml

@@ -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

requirements/base.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

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

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

requirements/reproducible-win.txt

@@ -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

samcli/cli/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]:
         """

samcli/commands/docs/core/command.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
 

samcli/commands/local/generate_event/event_generation.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

samcli/local/apigw/local_apigw_service.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()