From 18ba6ede49fce8660d02ecf271350636632c5958 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 10:19:21 -0700
Subject: [PATCH 01/15] chore(deps): bump actions/setup-go from 3 to 4 (#5418)

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>
---
 .github/workflows/validate_pyinstaller.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/validate_pyinstaller.yml b/.github/workflows/validate_pyinstaller.yml
index 04b5c828ca..b611420310 100644
--- a/.github/workflows/validate_pyinstaller.yml
+++ b/.github/workflows/validate_pyinstaller.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: "1.20"
       - name: Build PyInstaller
@@ -50,7 +50,7 @@ jobs:
         with:
           python-version: "3.7"
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: "1.20"
       - name: Build PyInstaller

From 00b262d1bea1b475854ffa79d78fc28a73801c77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 14:21:23 -0700
Subject: [PATCH 02/15] chore(deps-dev): bump filelock from 3.12.0 to 3.12.2 in
 /requirements (#5378)

Bumps [filelock](https://github.com/tox-dev/py-filelock) from 3.12.0 to 3.12.2.
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/py-filelock/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/py-filelock/compare/3.12.0...3.12.2)

---
updated-dependencies:
- dependency-name: filelock
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements/dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/dev.txt b/requirements/dev.txt
index 4ef0736e47..4370b187ca 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -33,7 +33,7 @@ pytest-rerunfailures==11.1.2
 # 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==2.0.4
 pytest-json-report==1.5.0
-filelock==3.12.0
+filelock==3.12.2
 
 # formatter
 black==22.6.0

From 663c88d992508a38f76123281b76c4615f8eed56 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 21:52:34 +0000
Subject: [PATCH 03/15] feat: updating app templates repo hash with
 (bb905c379830c3d8edbc196bda731076549028e3) (#5398)

Co-authored-by: GitHub Action <action@github.com>
---
 samcli/runtime_config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samcli/runtime_config.json b/samcli/runtime_config.json
index b648be6cc3..3609a8eea6 100644
--- a/samcli/runtime_config.json
+++ b/samcli/runtime_config.json
@@ -1,3 +1,3 @@
 {
-    "app_template_repo_commit": "67f28fd83477e0e15b394f995afb33b2053b4074"
+    "app_template_repo_commit": "bb905c379830c3d8edbc196bda731076549028e3"
 }

From 9a715915928b3a5ef96291228afc51f0356b1ffa Mon Sep 17 00:00:00 2001
From: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>
Date: Tue, 27 Jun 2023 20:09:17 -0700
Subject: [PATCH 04/15] fix: add a table for package help text. (#5298)

* fix: add a table for package help text.

* Update samcli/commands/package/core/command.py

Co-authored-by: Daniel Mil <84205762+mildaniel@users.noreply.github.com>

* tests: fix strings in package help text

* fix: PR comments

* fix: PR comments.

---------

Co-authored-by: Daniel Mil <84205762+mildaniel@users.noreply.github.com>
---
 samcli/cli/context.py                         |   6 +
 samcli/commands/_utils/options.py             |   8 +-
 samcli/commands/package/command.py            |  35 +++--
 samcli/commands/package/core/__init__.py      |   0
 samcli/commands/package/core/command.py       | 138 ++++++++++++++++++
 samcli/commands/package/core/formatters.py    |  19 +++
 samcli/commands/package/core/options.py       |  68 +++++++++
 tests/unit/cli/test_context.py                |   6 +
 tests/unit/commands/package/core/__init__.py  |   0
 .../commands/package/core/test_command.py     |  85 +++++++++++
 .../commands/package/core/test_formatter.py   |  12 ++
 .../commands/package/core/test_options.py     |  12 ++
 12 files changed, 373 insertions(+), 16 deletions(-)
 create mode 100644 samcli/commands/package/core/__init__.py
 create mode 100644 samcli/commands/package/core/command.py
 create mode 100644 samcli/commands/package/core/formatters.py
 create mode 100644 samcli/commands/package/core/options.py
 create mode 100644 tests/unit/commands/package/core/__init__.py
 create mode 100644 tests/unit/commands/package/core/test_command.py
 create mode 100644 tests/unit/commands/package/core/test_formatter.py
 create mode 100644 tests/unit/commands/package/core/test_options.py

diff --git a/samcli/cli/context.py b/samcli/cli/context.py
index 404fd36661..49c5e44c78 100644
--- a/samcli/cli/context.py
+++ b/samcli/cli/context.py
@@ -7,6 +7,7 @@
 from typing import List, Optional, cast
 
 import click
+from rich.console import Console
 
 from samcli.cli.formatters import RootCommandHelpTextFormatter
 from samcli.commands.exceptions import AWSServiceClientError
@@ -44,6 +45,11 @@ def __init__(self):
         self._session_id = str(uuid.uuid4())
         self._experimental = False
         self._exception = None
+        self._console = Console()
+
+    @property
+    def console(self):
+        return self._console
 
     @property
     def exception(self):
diff --git a/samcli/commands/_utils/options.py b/samcli/commands/_utils/options.py
index 188b1705b4..5b1b55cc32 100644
--- a/samcli/commands/_utils/options.py
+++ b/samcli/commands/_utils/options.py
@@ -326,7 +326,7 @@ def no_progressbar_click_option():
         default=False,
         required=False,
         is_flag=True,
-        help="Does not showcase a progress bar when uploading artifacts to s3 and pushing docker images to ECR",
+        help="Does not showcase a progress bar when uploading artifacts to S3 and pushing docker images to ECR",
     )
 
 
@@ -679,9 +679,9 @@ def resolve_s3_click_option(guided):
         required=False,
         is_flag=True,
         callback=callback,
-        help="Automatically resolve s3 bucket for non-guided deployments. "
-        "Enabling this option will also create a managed default s3 bucket for you. "
-        "If you do not provide a --s3-bucket value, the managed bucket will be used. "
+        help="Automatically resolve AWS S3 bucket for non-guided deployments. "
+        "Enabling this option will also create a managed default AWS S3 bucket for you. "
+        "If one does not provide a --s3-bucket value, the managed bucket will be used. "
         "Do not use --guided with this option.",
     )
 
diff --git a/samcli/commands/package/command.py b/samcli/commands/package/command.py
index ee74b67c37..41fb10b133 100644
--- a/samcli/commands/package/command.py
+++ b/samcli/commands/package/command.py
@@ -21,6 +21,7 @@
     template_click_option,
     use_json_option,
 )
+from samcli.commands.package.core.command import PackageCommand
 from samcli.lib.bootstrap.bootstrap import manage_stack
 from samcli.lib.cli_validation.image_repository_validation import image_repository_validation
 from samcli.lib.telemetry.metric import track_command, track_template_warnings
@@ -42,20 +43,30 @@ def resources_and_properties_help_string():
     )
 
 
-HELP_TEXT = (
-    """The SAM package command creates and uploads artifacts based on the package type of a given resource.
-It uploads local images to ECR for `Image` package types.
-It creates zip of your code and dependencies and uploads it to S3 for other package types.
-The command returns a copy of your template, replacing references to local artifacts
-with the AWS location where the command uploaded the artifacts.
-
-The following resources and their property locations are supported.
-"""
-    + resources_and_properties_help_string()
-)
+DESCRIPTION = """
+  Creates and uploads artifacts based on the package type of a given resource.
+  It uploads local images to ECR for `Image` package types.
+  It creates a zip of code and dependencies and uploads it to S3 for `Zip` package types. 
+  
+  A new template is returned which replaces references to local artifacts
+  with the AWS location where the command uploaded the artifacts.
+    """
 
 
-@click.command("package", short_help=SHORT_HELP, help=HELP_TEXT, context_settings=dict(max_content_width=120))
+@click.command(
+    "package",
+    short_help=SHORT_HELP,
+    context_settings={
+        "ignore_unknown_options": False,
+        "allow_interspersed_args": True,
+        "allow_extra_args": True,
+        "max_content_width": 120,
+    },
+    cls=PackageCommand,
+    help=SHORT_HELP,
+    description=DESCRIPTION,
+    requires_credentials=True,
+)
 @configuration_option(provider=TomlProvider(section="parameters"))
 @template_click_option(include_build=True)
 @click.option(
diff --git a/samcli/commands/package/core/__init__.py b/samcli/commands/package/core/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/package/core/command.py b/samcli/commands/package/core/command.py
new file mode 100644
index 0000000000..16a9ee3d2a
--- /dev/null
+++ b/samcli/commands/package/core/command.py
@@ -0,0 +1,138 @@
+"""
+`sam package` command class for help text visual layer.
+"""
+import click
+from click import Context, style
+from rich.table import Table
+
+from samcli.cli.core.command import CoreCommand
+from samcli.cli.row_modifiers import RowDefinition, ShowcaseRowModifier
+from samcli.commands.package.core.formatters import PackageCommandHelpTextFormatter
+from samcli.commands.package.core.options import OPTIONS_INFO
+from samcli.lib.utils.resources import resources_generator
+
+COL_SIZE_MODIFIER = 38
+
+
+class PackageCommand(CoreCommand):
+    """
+    `sam` package specific command class that specializes in the visual appearance
+    of `sam package` help text.
+    It hosts a custom formatter, examples, table for supported resources, acronyms
+    and how options are to be used in the CLI for `sam package`.
+    """
+
+    class CustomFormatterContext(Context):
+        formatter_class = PackageCommandHelpTextFormatter
+
+    context_class = CustomFormatterContext
+
+    @staticmethod
+    def format_examples(ctx: Context, formatter: PackageCommandHelpTextFormatter):
+        with formatter.indented_section(name="Examples", extra_indents=1):
+            with formatter.indented_section(name="Automatic resolution of S3 buckets", extra_indents=1):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(f"$ {ctx.command_path} --resolve-s3"),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ],
+                    col_max=COL_SIZE_MODIFIER,
+                )
+            with formatter.indented_section(name="Get packaged template", extra_indents=1):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(f"$ {ctx.command_path} --resolve-s3 --output-template-file packaged.yaml"),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ],
+                    col_max=COL_SIZE_MODIFIER,
+                )
+            with formatter.indented_section(name="Customized location for uploading artifacts", extra_indents=1):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(
+                                f"$ {ctx.command_path} --s3-bucket S3_BUCKET --output-template-file packaged.yaml"
+                            ),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ],
+                    col_max=COL_SIZE_MODIFIER,
+                )
+
+    @staticmethod
+    def format_table(formatter: PackageCommandHelpTextFormatter):
+        with formatter.section(name="Supported Resources"):
+            pass
+        ctx = click.get_current_context()
+        table = Table(width=ctx.max_content_width)
+        table.add_column("Resource")
+        table.add_column("Location")
+        for resource, location in resources_generator():
+            table.add_row(resource, location)
+        with ctx.obj.console.capture() as capture:
+            ctx.obj.console.print(table)
+        formatter.write_rd(
+            [
+                RowDefinition(name="\n"),
+                RowDefinition(name=capture.get()),
+            ],
+            col_max=COL_SIZE_MODIFIER,
+        )
+
+    @staticmethod
+    def format_acronyms(formatter: PackageCommandHelpTextFormatter):
+        with formatter.indented_section(name="Acronyms", extra_indents=1):
+            formatter.write_rd(
+                [
+                    RowDefinition(
+                        text="\n",
+                    ),
+                    RowDefinition(
+                        name="S3",
+                        text="Simple Storage Service",
+                        extra_row_modifiers=[ShowcaseRowModifier()],
+                    ),
+                    RowDefinition(
+                        name="ECR",
+                        text="Elastic Container Registry",
+                        extra_row_modifiers=[ShowcaseRowModifier()],
+                    ),
+                    RowDefinition(
+                        name="KMS",
+                        text="Key Management Service",
+                        extra_row_modifiers=[ShowcaseRowModifier()],
+                    ),
+                ],
+                col_max=COL_SIZE_MODIFIER,
+            )
+
+    def format_options(self, ctx: Context, formatter: PackageCommandHelpTextFormatter) -> None:  # type:ignore
+        # `ignore` is put in place here for mypy even though it is the correct behavior,
+        # as the `formatter_class` can be set in subclass of Command. If ignore is not set,
+        # mypy raises argument needs to be HelpFormatter as super class defines it.
+
+        self.format_description(formatter)
+        PackageCommand.format_examples(ctx, formatter)
+        PackageCommand.format_table(formatter)
+        PackageCommand.format_acronyms(formatter)
+
+        CoreCommand._format_options(
+            ctx=ctx,
+            params=self.get_params(ctx),
+            formatter=formatter,
+            formatting_options=OPTIONS_INFO,
+            write_rd_overrides={"col_max": COL_SIZE_MODIFIER},
+        )
diff --git a/samcli/commands/package/core/formatters.py b/samcli/commands/package/core/formatters.py
new file mode 100644
index 0000000000..3faca8d644
--- /dev/null
+++ b/samcli/commands/package/core/formatters.py
@@ -0,0 +1,19 @@
+from samcli.cli.formatters import RootCommandHelpTextFormatter
+from samcli.cli.row_modifiers import BaseLineRowModifier
+from samcli.commands.deploy.core.options import ALL_OPTIONS
+
+
+class PackageCommandHelpTextFormatter(RootCommandHelpTextFormatter):
+    # Picked an additive constant that gives an aesthetically pleasing look.
+    ADDITIVE_JUSTIFICATION = 15
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Add Additional space after determining the longest option.
+        # However, do not justify with padding for more than half the width of
+        # the terminal to retain aesthetics.
+        self.left_justification_length = min(
+            max([len(option) for option in ALL_OPTIONS]) + self.ADDITIVE_JUSTIFICATION,
+            self.width // 2 - self.indent_increment,
+        )
+        self.modifiers = [BaseLineRowModifier()]
diff --git a/samcli/commands/package/core/options.py b/samcli/commands/package/core/options.py
new file mode 100644
index 0000000000..5a10f943f9
--- /dev/null
+++ b/samcli/commands/package/core/options.py
@@ -0,0 +1,68 @@
+"""
+Package Command Options related Datastructures for formatting.
+"""
+from typing import Dict, List
+
+from samcli.cli.core.options import ALL_COMMON_OPTIONS, add_common_options_info
+from samcli.cli.row_modifiers import RowDefinition
+
+# The ordering of the option lists matter, they are the order in which options will be displayed.
+
+REQUIRED_OPTIONS: List[str] = ["s3_bucket", "resolve_s3"]
+
+AWS_CREDENTIAL_OPTION_NAMES: List[str] = ["region", "profile"]
+
+INFRASTRUCTURE_OPTION_NAMES: List[str] = [
+    "s3_prefix",
+    "image_repository",
+    "image_repositories",
+    "kms_key_id",
+    "metadata",
+]
+
+DEPLOYMENT_OPTIONS: List[str] = [
+    "force_upload",
+]
+
+CONFIGURATION_OPTION_NAMES: List[str] = ["config_env", "config_file"]
+
+ADDITIONAL_OPTIONS: List[str] = [
+    "no_progressbar",
+    "signing_profiles",
+    "template_file",
+    "output_template_file",
+    "use_json",
+]
+
+ALL_OPTIONS: List[str] = (
+    REQUIRED_OPTIONS
+    + AWS_CREDENTIAL_OPTION_NAMES
+    + INFRASTRUCTURE_OPTION_NAMES
+    + DEPLOYMENT_OPTIONS
+    + CONFIGURATION_OPTION_NAMES
+    + ADDITIONAL_OPTIONS
+    + ALL_COMMON_OPTIONS
+)
+
+OPTIONS_INFO: Dict[str, Dict] = {
+    "Required Options": {"option_names": {opt: {"rank": idx} for idx, opt in enumerate(REQUIRED_OPTIONS)}},
+    "AWS Credential Options": {
+        "option_names": {opt: {"rank": idx} for idx, opt in enumerate(AWS_CREDENTIAL_OPTION_NAMES)}
+    },
+    "Infrastructure Options": {
+        "option_names": {opt: {"rank": idx} for idx, opt in enumerate(INFRASTRUCTURE_OPTION_NAMES)}
+    },
+    "Package Management Options": {"option_names": {opt: {"rank": idx} for idx, opt in enumerate(DEPLOYMENT_OPTIONS)}},
+    "Configuration Options": {
+        "option_names": {opt: {"rank": idx} for idx, opt in enumerate(CONFIGURATION_OPTION_NAMES)},
+        "extras": [
+            RowDefinition(name="Learn more about configuration files at:"),
+            RowDefinition(
+                name="https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli"
+                "-config.html. "
+            ),
+        ],
+    },
+    "Additional Options": {"option_names": {opt: {"rank": idx} for idx, opt in enumerate(ADDITIONAL_OPTIONS)}},
+}
+add_common_options_info(OPTIONS_INFO)
diff --git a/tests/unit/cli/test_context.py b/tests/unit/cli/test_context.py
index 709182e0f5..06dce014a5 100644
--- a/tests/unit/cli/test_context.py
+++ b/tests/unit/cli/test_context.py
@@ -5,6 +5,8 @@
 from unittest import TestCase
 from unittest.mock import patch, ANY
 
+from rich.console import Console
+
 from samcli.cli.context import Context
 from samcli.lib.utils.sam_logging import (
     SamCliLogger,
@@ -20,6 +22,10 @@ def test_must_initialize_with_defaults(self):
 
         self.assertEqual(ctx.debug, False, "debug must default to False")
 
+    def test_must_have_console(self):
+        ctx = Context()
+        self.assertTrue(isinstance(ctx.console, Console))
+
     def test_must_set_get_debug_flag(self):
         ctx = Context()
 
diff --git a/tests/unit/commands/package/core/__init__.py b/tests/unit/commands/package/core/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/package/core/test_command.py b/tests/unit/commands/package/core/test_command.py
new file mode 100644
index 0000000000..fdfd571461
--- /dev/null
+++ b/tests/unit/commands/package/core/test_command.py
@@ -0,0 +1,85 @@
+import unittest
+from unittest.mock import Mock, patch, MagicMock
+from samcli.commands.package.core.command import PackageCommand
+from samcli.commands.package.command import DESCRIPTION
+from tests.unit.cli.test_command import MockFormatter
+
+
+class MockParams:
+    def __init__(self, rv, name):
+        self.rv = rv
+        self.name = name
+
+    def get_help_record(self, ctx):
+        return self.rv
+
+
+class TestPackageCommand(unittest.TestCase):
+    @patch.object(PackageCommand, "get_params")
+    def test_get_options_package_command_text(self, mock_get_params):
+        with patch("click.get_current_context", return_value=MagicMock()) as mock_get_current_context:
+            # Set up the chain of calls to return 'mock' on .get()
+            mock_get_current_context.return_value.obj.console.capture().__enter__().get.return_value = "mock"
+            ctx = Mock()
+            ctx.command_path = "sam package"
+            ctx.parent.command_path = "sam"
+            formatter = MockFormatter(scrub_text=True)
+            # NOTE(sriram-mv): One option per option section.
+            mock_get_params.return_value = [
+                MockParams(rv=("--region", "Region"), name="region"),
+                MockParams(rv=("--debug", ""), name="debug"),
+                MockParams(rv=("--config-file", ""), name="config_file"),
+                MockParams(rv=("--s3-prefix", ""), name="s3_prefix"),
+                MockParams(rv=("--s3-bucket", ""), name="s3_bucket"),
+                MockParams(rv=("--signing-profiles", ""), name="signing_profiles"),
+                MockParams(rv=("--stack-name", ""), name="stack_name"),
+                MockParams(rv=("--force-upload", ""), name="force_upload"),
+                MockParams(rv=("--beta-features", ""), name="beta_features"),
+            ]
+
+            cmd = PackageCommand(name="package", requires_credentials=False, description=DESCRIPTION)
+            expected_output = {
+                "AWS Credential Options": [("", ""), ("--region", ""), ("", "")],
+                "Acronyms": [("", ""), ("S3", ""), ("ECR", ""), ("KMS", "")],
+                "Additional Options": [("", ""), ("--signing-profiles", ""), ("", "")],
+                "Automatic resolution of S3 buckets": [("", ""), ("$ sam package --resolve-s3\x1b[0m", "")],
+                "Beta Options": [("", ""), ("--beta-features", ""), ("", "")],
+                "Configuration Options": [("", ""), ("--config-file", ""), ("", "")],
+                "Customized location for uploading artifacts": [
+                    ("", ""),
+                    ("$ sam package --s3-bucket " "S3_BUCKET " "--output-template-file " "packaged.yaml\x1b[0m", ""),
+                ],
+                "Description": [
+                    (
+                        "\n"
+                        "  Creates and uploads artifacts based on the package type "
+                        "of a given resource.\n"
+                        "  It uploads local images to ECR for `Image` package "
+                        "types.\n"
+                        "  It creates a zip of code and dependencies and uploads it "
+                        "to S3 for `Zip` package types. \n"
+                        "  \n"
+                        "  A new template is returned which replaces references to "
+                        "local artifacts\n"
+                        "  with the AWS location where the command uploaded the "
+                        "artifacts.\n"
+                        "    \x1b[1m\n"
+                        "  This command may not require access to AWS "
+                        "credentials.\x1b[0m",
+                        "",
+                    )
+                ],
+                "Examples": [],
+                "Get packaged template": [
+                    ("", ""),
+                    ("$ sam package --resolve-s3 --output-template-file " "packaged.yaml\x1b[0m", ""),
+                ],
+                "Infrastructure Options": [("", ""), ("--s3-prefix", ""), ("", "")],
+                "Other Options": [("", ""), ("--debug", ""), ("", "")],
+                "Package Management Options": [("", ""), ("--force-upload", ""), ("", "")],
+                "Required Options": [("", ""), ("--s3-bucket", ""), ("", "")],
+                "Supported Resources": [("\n", ""), ("mock", "")],
+            }
+
+            cmd.format_options(ctx, formatter)
+            self.assertEqual(formatter.data, expected_output)
diff --git a/tests/unit/commands/package/core/test_formatter.py b/tests/unit/commands/package/core/test_formatter.py
new file mode 100644
index 0000000000..559b247fd6
--- /dev/null
+++ b/tests/unit/commands/package/core/test_formatter.py
@@ -0,0 +1,12 @@
+from shutil import get_terminal_size
+from unittest import TestCase
+
+from samcli.cli.row_modifiers import BaseLineRowModifier
+from samcli.commands.package.core.formatters import PackageCommandHelpTextFormatter
+
+
+class TestPackageCommandHelpTextFormatter(TestCase):
+    def test_deploy_formatter(self):
+        self.formatter = PackageCommandHelpTextFormatter()
+        self.assertTrue(self.formatter.left_justification_length <= get_terminal_size().columns // 2)
+        self.assertIsInstance(self.formatter.modifiers[0], BaseLineRowModifier)
diff --git a/tests/unit/commands/package/core/test_options.py b/tests/unit/commands/package/core/test_options.py
new file mode 100644
index 0000000000..534aadb2f3
--- /dev/null
+++ b/tests/unit/commands/package/core/test_options.py
@@ -0,0 +1,12 @@
+from unittest import TestCase
+
+from click import Option
+
+from samcli.commands.package.command import cli
+from samcli.commands.package.core.options import ALL_OPTIONS
+
+
+class TestOptions(TestCase):
+    def test_all_options_formatted(self):
+        command_options = [param.human_readable_name if isinstance(param, Option) else None for param in cli.params]
+        self.assertEqual(sorted(ALL_OPTIONS), sorted(filter(lambda item: item is not None, command_options + ["help"])))

From 743d389f7bf10570cd68b1292c5e16be6e734615 Mon Sep 17 00:00:00 2001
From: Lucas <12496191+lucashuy@users.noreply.github.com>
Date: Wed, 28 Jun 2023 14:50:03 -0700
Subject: [PATCH 05/15] fix: Handle BROKEN_PIPE_ERROR (#5386)

* Handle pywintypes pipe exception

* Moved exception checking to check for winerror

* Use decorator and added unit tests

* Added failure test case

* make format

* Added more context/comments
---
 samcli/lib/utils/file_observer.py          | 42 ++++++++++++++++++++++
 tests/unit/lib/utils/test_file_observer.py | 28 +++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/samcli/lib/utils/file_observer.py b/samcli/lib/utils/file_observer.py
index 8ccf25cd9a..282aedb97b 100644
--- a/samcli/lib/utils/file_observer.py
+++ b/samcli/lib/utils/file_observer.py
@@ -2,6 +2,7 @@
 Wraps watchdog to observe file system for any change.
 """
 import logging
+import platform
 import threading
 import uuid
 from abc import ABC, abstractmethod
@@ -24,6 +25,8 @@
 from samcli.local.lambdafn.config import FunctionConfig
 
 LOG = logging.getLogger(__name__)
+# Windows API error returned when attempting to perform I/O on closed pipe
+BROKEN_PIPE_ERROR = 109
 
 
 class ResourceObserver(ABC):
@@ -243,6 +246,44 @@ class ImageObserverException(ObserverException):
     """
 
 
+def broken_pipe_handler(func: Callable) -> Callable:
+    """
+    Decorator to handle the Windows API BROKEN_PIPE_ERROR error.
+
+    Parameters
+    ----------
+    func: Callable
+        The method to wrap around
+    """
+
+    # NOTE: As of right now, this checks for the Windows API error 109
+    # specifically. This could be abstracted to potentially utilize a
+    # callback method to further customize this.
+
+    def wrapper(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except Exception as exception:
+            # handle a pywintypes exception that gets thrown when trying to exit
+            # from a command that utilizes ImageObserver(s) in
+            # EAGER container mode (start-api, start-lambda)
+
+            # all containers would have been stopped, and deleted, however
+            # the pipes to those containers are still loaded somewhere
+
+            if not platform.system() == "Windows":
+                raise
+
+            win_error = getattr(exception, "winerror", None)
+
+            if not win_error == BROKEN_PIPE_ERROR:
+                raise
+
+            LOG.debug("Handling BROKEN_PIPE_ERROR pywintypes, exception ignored gracefully")
+
+    return wrapper
+
+
 class ImageObserver(ResourceObserver):
     """
     A class that will observe some docker images for any change.
@@ -263,6 +304,7 @@ def __init__(self, on_change: Callable) -> None:
         self._images_observer_thread: Optional[Thread] = None
         self._lock: Lock = threading.Lock()
 
+    @broken_pipe_handler
     def _watch_images_events(self):
         for event in self.events:
             if event.get("Action", None) != "tag":
diff --git a/tests/unit/lib/utils/test_file_observer.py b/tests/unit/lib/utils/test_file_observer.py
index 739648ad4c..9400aac775 100644
--- a/tests/unit/lib/utils/test_file_observer.py
+++ b/tests/unit/lib/utils/test_file_observer.py
@@ -11,6 +11,7 @@
 from samcli.lib.utils.file_observer import (
     FileObserver,
     FileObserverException,
+    broken_pipe_handler,
     calculate_checksum,
     ImageObserver,
     ImageObserverException,
@@ -1070,3 +1071,30 @@ def test_calculate_check_sum_for_dir(self, dir_checksum_mock, PathMock):
         path_mock.is_file.return_value = False
         dir_checksum_mock.return_value = "1234"
         self.assertEqual(calculate_checksum(path), "1234")
+
+
+class TestBrokenPipeDecorator(TestCase):
+    def setUp(self):
+        self.mock_exception = Exception()
+        setattr(self.mock_exception, "winerror", 109)
+
+    @patch("samcli.lib.utils.file_observer.platform.system")
+    def test_decorator_handle_gracefully(self, system_mock):
+        system_mock.return_value = "Windows"
+
+        @broken_pipe_handler
+        def test_method():
+            raise self.mock_exception
+
+        test_method()
+
+    @patch("samcli.lib.utils.file_observer.platform.system")
+    def test_decorator_raises_exception(self, system_mock):
+        system_mock.return_value = "not windows"
+
+        @broken_pipe_handler
+        def test_method():
+            raise self.mock_exception
+
+        with self.assertRaises(Exception):
+            test_method()

From 3952ff61527cee07265aab7c4b109db66f301f61 Mon Sep 17 00:00:00 2001
From: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>
Date: Thu, 29 Jun 2023 13:38:46 -0700
Subject: [PATCH 06/15] fix: remove circular dependency by moving parse_s3
 method to its own util file (#5430)

* fix: remove circular dependency by moving parse_s3 method to its own util file

* add missing unit tests file
---
 .../companion_stack_manager.py                |  3 +-
 samcli/lib/deploy/deployer.py                 |  5 +-
 samcli/lib/package/artifact_exporter.py       |  6 +-
 samcli/lib/package/code_signer.py             |  4 +-
 samcli/lib/package/packageable_resources.py   |  5 +-
 samcli/lib/package/s3_uploader.py             | 77 +------------------
 samcli/lib/package/utils.py                   |  3 +-
 samcli/lib/utils/s3.py                        | 74 ++++++++++++++++++
 tests/end_to_end/test_stages.py               |  3 +-
 .../test_companion_stack_manager.py           |  4 +
 .../lib/package/test_artifact_exporter.py     | 46 -----------
 tests/unit/lib/utils/test_s3.py               | 49 ++++++++++++
 12 files changed, 146 insertions(+), 133 deletions(-)
 create mode 100644 samcli/lib/utils/s3.py
 create mode 100644 tests/unit/lib/utils/test_s3.py

diff --git a/samcli/lib/bootstrap/companion_stack/companion_stack_manager.py b/samcli/lib/bootstrap/companion_stack/companion_stack_manager.py
index 612341988d..f15d3e52bf 100644
--- a/samcli/lib/bootstrap/companion_stack/companion_stack_manager.py
+++ b/samcli/lib/bootstrap/companion_stack/companion_stack_manager.py
@@ -17,6 +17,7 @@
 from samcli.lib.providers.sam_function_provider import SamFunctionProvider
 from samcli.lib.providers.sam_stack_provider import SamLocalStackProvider
 from samcli.lib.utils.packagetype import IMAGE
+from samcli.lib.utils.s3 import parse_s3_url
 
 # pylint: disable=E0401
 if typing.TYPE_CHECKING:  # pragma: no cover
@@ -112,7 +113,7 @@ def update_companion_stack(self) -> None:
                 self._s3_client, bucket_name=self._s3_bucket, prefix=self._s3_prefix, no_progressbar=True
             )
             # TemplateUrl property requires S3 URL to be in path-style format
-            parts = S3Uploader.parse_s3_url(
+            parts = parse_s3_url(
                 s3_uploader.upload_with_dedup(temporary_file.name, "template"), version_property="Version"
             )
 
diff --git a/samcli/lib/deploy/deployer.py b/samcli/lib/deploy/deployer.py
index 16e860c54c..58a2582403 100644
--- a/samcli/lib/deploy/deployer.py
+++ b/samcli/lib/deploy/deployer.py
@@ -38,6 +38,7 @@
 from samcli.lib.package.local_files_utils import get_uploaded_s3_object_name, mktempfile
 from samcli.lib.package.s3_uploader import S3Uploader
 from samcli.lib.utils.colors import Colored, Colors
+from samcli.lib.utils.s3 import parse_s3_url
 from samcli.lib.utils.time import utc_to_timestamp
 
 LOG = logging.getLogger(__name__)
@@ -203,9 +204,7 @@ def _process_kwargs(
                 temporary_file.flush()
                 remote_path = get_uploaded_s3_object_name(file_path=temporary_file.name, extension="template")
                 # TemplateUrl property requires S3 URL to be in path-style format
-                parts = S3Uploader.parse_s3_url(
-                    s3_uploader.upload(temporary_file.name, remote_path), version_property="Version"
-                )
+                parts = parse_s3_url(s3_uploader.upload(temporary_file.name, remote_path), version_property="Version")
                 kwargs["TemplateURL"] = s3_uploader.to_path_style_s3_url(parts["Key"], parts.get("Version", None))
 
         # don't set these arguments if not specified to use existing values
diff --git a/samcli/lib/package/artifact_exporter.py b/samcli/lib/package/artifact_exporter.py
index 9e60dc5c1c..b2bbce7328 100644
--- a/samcli/lib/package/artifact_exporter.py
+++ b/samcli/lib/package/artifact_exporter.py
@@ -29,7 +29,6 @@
     ECRResource,
     ResourceZip,
 )
-from samcli.lib.package.s3_uploader import S3Uploader
 from samcli.lib.package.uploaders import Destination, Uploaders
 from samcli.lib.package.utils import (
     is_local_file,
@@ -47,6 +46,7 @@
     AWS_SERVERLESS_FUNCTION,
     RESOURCES_WITH_LOCAL_PATHS,
 )
+from samcli.lib.utils.s3 import parse_s3_url
 from samcli.yamlhelper import yaml_dump, yaml_parse
 
 # NOTE: sriram-mv, A cyclic dependency on `Template` needs to be broken.
@@ -99,7 +99,7 @@ def do_export(self, resource_id, resource_dict, parent_dir):
             url = self.uploader.upload(temporary_file.name, remote_path)
 
             # TemplateUrl property requires S3 URL to be in path-style format
-            parts = S3Uploader.parse_s3_url(url, version_property="Version")
+            parts = parse_s3_url(url, version_property="Version")
             s3_path_url = self.uploader.to_path_style_s3_url(parts["Key"], parts.get("Version", None))
             set_value_from_jmespath(resource_dict, self.PROPERTY_NAME, s3_path_url)
 
@@ -146,7 +146,7 @@ def do_export(self, resource_id, resource_dict, parent_dir):
         url = self.uploader.upload(abs_template_path, remote_path)
 
         # TemplateUrl property requires S3 URL to be in path-style format
-        parts = S3Uploader.parse_s3_url(url, version_property="Version")
+        parts = parse_s3_url(url, version_property="Version")
         s3_path_url = self.uploader.to_path_style_s3_url(parts["Key"], parts.get("Version", None))
         set_value_from_jmespath(resource_dict, self.PROPERTY_NAME, s3_path_url)
 
diff --git a/samcli/lib/package/code_signer.py b/samcli/lib/package/code_signer.py
index 92f0a78273..02434d8fb5 100644
--- a/samcli/lib/package/code_signer.py
+++ b/samcli/lib/package/code_signer.py
@@ -5,7 +5,7 @@
 import logging
 
 from samcli.commands.exceptions import UserException
-from samcli.lib.package.s3_uploader import S3Uploader
+from samcli.lib.utils.s3 import parse_s3_url
 
 LOG = logging.getLogger(__name__)
 
@@ -60,7 +60,7 @@ def sign_package(self, resource_id, s3_url, s3_version):
         profile_owner = signing_profile_for_resource["profile_owner"]
 
         # parse given s3 url, and extract bucket and object key
-        parsed_s3_url = S3Uploader.parse_s3_url(s3_url)
+        parsed_s3_url = parse_s3_url(s3_url)
         s3_bucket = parsed_s3_url["Bucket"]
         s3_key = parsed_s3_url["Key"]
         s3_target_prefix = s3_key.rsplit("/", 1)[0] + "/signed_"
diff --git a/samcli/lib/package/packageable_resources.py b/samcli/lib/package/packageable_resources.py
index 79458dc5bc..ca245715b5 100644
--- a/samcli/lib/package/packageable_resources.py
+++ b/samcli/lib/package/packageable_resources.py
@@ -51,6 +51,7 @@
     RESOURCES_WITH_IMAGE_COMPONENT,
     RESOURCES_WITH_LOCAL_PATHS,
 )
+from samcli.lib.utils.s3 import parse_s3_url
 
 LOG = logging.getLogger(__name__)
 
@@ -196,7 +197,7 @@ def get_property_value(self, resource_dict):
         # artifact, as deletion of intrinsic ref function artifacts is not supported yet.
         # TODO: Allow deletion of S3 artifacts with intrinsic ref functions.
         if resource_path and isinstance(resource_path, str):
-            return self.uploader.parse_s3_url(resource_path)
+            return parse_s3_url(resource_path)
         return {"Bucket": None, "Key": None}
 
 
@@ -340,7 +341,7 @@ def do_export(self, resource_id, resource_dict, parent_dir):
             self.RESOURCE_TYPE, resource_id, resource_dict, self.PROPERTY_NAME, parent_dir, self.uploader
         )
 
-        parsed_url = S3Uploader.parse_s3_url(
+        parsed_url = parse_s3_url(
             artifact_s3_url,
             bucket_name_property=self.BUCKET_NAME_PROPERTY,
             object_key_property=self.OBJECT_KEY_PROPERTY,
diff --git a/samcli/lib/package/s3_uploader.py b/samcli/lib/package/s3_uploader.py
index 5dab8c0d9a..fe141ada51 100644
--- a/samcli/lib/package/s3_uploader.py
+++ b/samcli/lib/package/s3_uploader.py
@@ -20,8 +20,7 @@
 import sys
 import threading
 from collections import abc
-from typing import Any, Dict, Optional, cast
-from urllib.parse import parse_qs, urlparse
+from typing import Any, Optional, cast
 
 import botocore
 import botocore.exceptions
@@ -30,6 +29,7 @@
 
 from samcli.commands.package.exceptions import BucketNotSpecifiedError, NoSuchBucketError
 from samcli.lib.package.local_files_utils import get_uploaded_s3_object_name
+from samcli.lib.utils.s3 import parse_s3_url
 
 LOG = logging.getLogger(__name__)
 
@@ -234,7 +234,7 @@ def get_version_of_artifact(self, s3_url: str) -> str:
         """
         Returns version information of the S3 object that is given as S3 URL
         """
-        parsed_s3_url = self.parse_s3_url(s3_url)
+        parsed_s3_url = parse_s3_url(s3_url)
         s3_bucket = parsed_s3_url["Bucket"]
         s3_key = parsed_s3_url["Key"]
         s3_object_tagging = self.s3.get_object_tagging(Bucket=s3_bucket, Key=s3_key)
@@ -242,77 +242,6 @@ def get_version_of_artifact(self, s3_url: str) -> str:
         s3_object_version_id = s3_object_tagging["VersionId"]
         return cast(str, s3_object_version_id)
 
-    @staticmethod
-    def parse_s3_url(
-        url: Any,
-        bucket_name_property: str = "Bucket",
-        object_key_property: str = "Key",
-        version_property: Optional[str] = None,
-    ) -> Dict:
-        if isinstance(url, str) and url.startswith("s3://"):
-            return S3Uploader._parse_s3_format_url(
-                url=url,
-                bucket_name_property=bucket_name_property,
-                object_key_property=object_key_property,
-                version_property=version_property,
-            )
-
-        if isinstance(url, str) and url.startswith("https://s3"):
-            return S3Uploader._parse_path_style_s3_url(
-                url=url, bucket_name_property=bucket_name_property, object_key_property=object_key_property
-            )
-
-        raise ValueError("URL given to the parse method is not a valid S3 url {0}".format(url))
-
-    @staticmethod
-    def _parse_s3_format_url(
-        url: Any,
-        bucket_name_property: str = "Bucket",
-        object_key_property: str = "Key",
-        version_property: Optional[str] = None,
-    ) -> Dict:
-        """
-        Method for parsing s3 urls that begin with s3://
-        e.g. s3://bucket/key
-        """
-        parsed = urlparse(url)
-        query = parse_qs(parsed.query)
-        if parsed.netloc and parsed.path:
-            result = dict()
-            result[bucket_name_property] = parsed.netloc
-            result[object_key_property] = parsed.path.lstrip("/")
-
-            # If there is a query string that has a single versionId field,
-            # set the object version and return
-            if version_property is not None and "versionId" in query and len(query["versionId"]) == 1:
-                result[version_property] = query["versionId"][0]
-
-            return result
-
-        raise ValueError("URL given to the parse method is not a valid S3 url {0}".format(url))
-
-    @staticmethod
-    def _parse_path_style_s3_url(
-        url: Any,
-        bucket_name_property: str = "Bucket",
-        object_key_property: str = "Key",
-    ) -> Dict:
-        """
-        Static method for parsing path style s3 urls.
-        e.g. https://s3.us-east-1.amazonaws.com/bucket/key
-        """
-        parsed = urlparse(url)
-        result = dict()
-        # parsed.path would point to /bucket/key
-        if parsed.path:
-            s3_bucket_key = parsed.path.split("/", 2)[1:]
-
-            result[bucket_name_property] = s3_bucket_key[0]
-            result[object_key_property] = s3_bucket_key[1]
-
-            return result
-        raise ValueError("URL given to the parse method is not a valid S3 url {0}".format(url))
-
 
 class ProgressPercentage:
     # This class was copied directly from S3Transfer docs
diff --git a/samcli/lib/package/utils.py b/samcli/lib/package/utils.py
index 8650d3efa8..d0a1ae9787 100644
--- a/samcli/lib/package/utils.py
+++ b/samcli/lib/package/utils.py
@@ -26,6 +26,7 @@
 from samcli.lib.package.s3_uploader import S3Uploader
 from samcli.lib.utils.hash import dir_checksum
 from samcli.lib.utils.resources import LAMBDA_LOCAL_RESOURCES
+from samcli.lib.utils.s3 import parse_s3_url
 
 LOG = logging.getLogger(__name__)
 
@@ -68,7 +69,7 @@ def is_s3_protocol_url(url):
     Check whether url is a valid path in the form of "s3://..."
     """
     try:
-        S3Uploader.parse_s3_url(url)
+        parse_s3_url(url)
         return True
     except ValueError:
         return False
diff --git a/samcli/lib/utils/s3.py b/samcli/lib/utils/s3.py
new file mode 100644
index 0000000000..e841fb236c
--- /dev/null
+++ b/samcli/lib/utils/s3.py
@@ -0,0 +1,74 @@
+"""Contains utility functions related to AWS S3 service"""
+from typing import Any, Dict, Optional
+from urllib.parse import parse_qs, urlparse
+
+
+def parse_s3_url(
+    url: Any,
+    bucket_name_property: str = "Bucket",
+    object_key_property: str = "Key",
+    version_property: Optional[str] = None,
+) -> Dict:
+    if isinstance(url, str) and url.startswith("s3://"):
+        return _parse_s3_format_url(
+            url=url,
+            bucket_name_property=bucket_name_property,
+            object_key_property=object_key_property,
+            version_property=version_property,
+        )
+
+    if isinstance(url, str) and url.startswith("https://s3"):
+        return _parse_path_style_s3_url(
+            url=url, bucket_name_property=bucket_name_property, object_key_property=object_key_property
+        )
+
+    raise ValueError("URL given to the parse method is not a valid S3 url {0}".format(url))
+
+
+def _parse_s3_format_url(
+    url: Any,
+    bucket_name_property: str = "Bucket",
+    object_key_property: str = "Key",
+    version_property: Optional[str] = None,
+) -> Dict:
+    """
+    Method for parsing s3 urls that begin with s3://
+    e.g. s3://bucket/key
+    """
+    parsed = urlparse(url)
+    query = parse_qs(parsed.query)
+    if parsed.netloc and parsed.path:
+        result = dict()
+        result[bucket_name_property] = parsed.netloc
+        result[object_key_property] = parsed.path.lstrip("/")
+
+        # If there is a query string that has a single versionId field,
+        # set the object version and return
+        if version_property is not None and "versionId" in query and len(query["versionId"]) == 1:
+            result[version_property] = query["versionId"][0]
+
+        return result
+
+    raise ValueError("URL given to the parse method is not a valid S3 url {0}".format(url))
+
+
+def _parse_path_style_s3_url(
+    url: Any,
+    bucket_name_property: str = "Bucket",
+    object_key_property: str = "Key",
+) -> Dict:
+    """
+    Static method for parsing path style s3 urls.
+    e.g. https://s3.us-east-1.amazonaws.com/bucket/key
+    """
+    parsed = urlparse(url)
+    result = dict()
+    # parsed.path would point to /bucket/key
+    if parsed.path:
+        s3_bucket_key = parsed.path.split("/", 2)[1:]
+
+        result[bucket_name_property] = s3_bucket_key[0]
+        result[object_key_property] = s3_bucket_key[1]
+
+        return result
+    raise ValueError("URL given to the parse method is not a valid S3 url {0}".format(url))
diff --git a/tests/end_to_end/test_stages.py b/tests/end_to_end/test_stages.py
index 8e60211924..f405606331 100644
--- a/tests/end_to_end/test_stages.py
+++ b/tests/end_to_end/test_stages.py
@@ -12,6 +12,7 @@
 
 from samcli.cli.global_config import GlobalConfig
 from filelock import FileLock
+from samcli.lib.utils.s3 import parse_s3_url
 from tests.end_to_end.end_to_end_context import EndToEndTestContext
 from tests.testing_utils import CommandResult, run_command, run_command_with_input
 
@@ -102,7 +103,7 @@ def _download_packaged_file(self):
         )
 
         if zipped_fn_s3_loc:
-            s3_info = S3Uploader.parse_s3_url(zipped_fn_s3_loc)
+            s3_info = parse_s3_url(zipped_fn_s3_loc)
             self.s3_client.download_file(s3_info["Bucket"], s3_info["Key"], str(zip_file_path))
 
             with zipfile.ZipFile(zip_file_path, "r") as zip_refzip:
diff --git a/tests/unit/lib/bootstrap/companion_stack/test_companion_stack_manager.py b/tests/unit/lib/bootstrap/companion_stack/test_companion_stack_manager.py
index f40fb36bd8..69f7d76ff6 100644
--- a/tests/unit/lib/bootstrap/companion_stack/test_companion_stack_manager.py
+++ b/tests/unit/lib/bootstrap/companion_stack/test_companion_stack_manager.py
@@ -48,8 +48,10 @@ def test_set_functions(self):
 
     @patch("samcli.lib.bootstrap.companion_stack.companion_stack_manager.mktempfile")
     @patch("samcli.lib.bootstrap.companion_stack.companion_stack_manager.S3Uploader")
+    @patch("samcli.lib.bootstrap.companion_stack.companion_stack_manager.parse_s3_url")
     def test_create_companion_stack(
         self,
+        parse_s3_url_mock,
         s3_uploader_mock,
         mktempfile_mock,
     ):
@@ -70,8 +72,10 @@ def test_create_companion_stack(
 
     @patch("samcli.lib.bootstrap.companion_stack.companion_stack_manager.mktempfile")
     @patch("samcli.lib.bootstrap.companion_stack.companion_stack_manager.S3Uploader")
+    @patch("samcli.lib.bootstrap.companion_stack.companion_stack_manager.parse_s3_url")
     def test_update_companion_stack(
         self,
+        parse_s3_url_mock,
         s3_uploader_mock,
         mktempfile_mock,
     ):
diff --git a/tests/unit/lib/package/test_artifact_exporter.py b/tests/unit/lib/package/test_artifact_exporter.py
index 1a2e7f2227..41ac388714 100644
--- a/tests/unit/lib/package/test_artifact_exporter.py
+++ b/tests/unit/lib/package/test_artifact_exporter.py
@@ -19,7 +19,6 @@
     AdditiveFilePermissionPermissionMapper,
     AdditiveDirPermissionPermissionMapper,
 )
-from samcli.lib.package.s3_uploader import S3Uploader
 from samcli.lib.package.uploaders import Destination
 from samcli.lib.package.utils import zip_folder, make_zip, make_zip_with_lambda_permissions, make_zip_with_permissions
 from samcli.lib.utils.packagetype import ZIP, IMAGE
@@ -293,51 +292,6 @@ def _assert_is_valid_s3_url(self, url):
     def _assert_is_invalid_s3_url(self, url):
         self.assertFalse(is_s3_protocol_url(url), "{0} should be valid".format(url))
 
-    def test_parse_s3_url(self):
-        valid = [
-            {"url": "s3://foo/bar", "result": {"Bucket": "foo", "Key": "bar"}},
-            {"url": "s3://foo/bar/cat/dog", "result": {"Bucket": "foo", "Key": "bar/cat/dog"}},
-            {
-                "url": "s3://foo/bar/baz?versionId=abc&param1=val1&param2=val2",
-                "result": {"Bucket": "foo", "Key": "bar/baz", "VersionId": "abc"},
-            },
-            {
-                # VersionId is not returned if there are more than one versionId
-                # keys in query parameter
-                "url": "s3://foo/bar/baz?versionId=abc&versionId=123",
-                "result": {"Bucket": "foo", "Key": "bar/baz"},
-            },
-            {
-                # Path style url
-                "url": "https://s3-eu-west-1.amazonaws.com/bucket/key",
-                "result": {"Bucket": "bucket", "Key": "key"},
-            },
-            {
-                # Path style url
-                "url": "https://s3.us-east-1.amazonaws.com/bucket/key",
-                "result": {"Bucket": "bucket", "Key": "key"},
-            },
-        ]
-
-        invalid = [
-            # For purposes of exporter, we need S3 URLs to point to an object
-            # and not a bucket
-            "s3://foo",
-            "https://www.amazon.com",
-            "https://s3.us-east-1.amazonaws.com",
-        ]
-
-        for config in valid:
-            result = S3Uploader.parse_s3_url(
-                config["url"], bucket_name_property="Bucket", object_key_property="Key", version_property="VersionId"
-            )
-
-            self.assertEqual(result, config["result"])
-
-        for url in invalid:
-            with self.assertRaises(ValueError):
-                S3Uploader.parse_s3_url(url)
-
     def test_is_local_file(self):
         with tempfile.NamedTemporaryFile() as handle:
             self.assertTrue(is_local_file(handle.name))
diff --git a/tests/unit/lib/utils/test_s3.py b/tests/unit/lib/utils/test_s3.py
new file mode 100644
index 0000000000..c4900b908b
--- /dev/null
+++ b/tests/unit/lib/utils/test_s3.py
@@ -0,0 +1,49 @@
+from unittest import TestCase
+from samcli.lib.utils.s3 import parse_s3_url
+
+
+class TestS3Utils(TestCase):
+    def test_parse_s3_url(self):
+        valid = [
+            {"url": "s3://foo/bar", "result": {"Bucket": "foo", "Key": "bar"}},
+            {"url": "s3://foo/bar/cat/dog", "result": {"Bucket": "foo", "Key": "bar/cat/dog"}},
+            {
+                "url": "s3://foo/bar/baz?versionId=abc&param1=val1&param2=val2",
+                "result": {"Bucket": "foo", "Key": "bar/baz", "VersionId": "abc"},
+            },
+            {
+                # VersionId is not returned if there are more than one versionId
+                # keys in query parameter
+                "url": "s3://foo/bar/baz?versionId=abc&versionId=123",
+                "result": {"Bucket": "foo", "Key": "bar/baz"},
+            },
+            {
+                # Path style url
+                "url": "https://s3-eu-west-1.amazonaws.com/bucket/key",
+                "result": {"Bucket": "bucket", "Key": "key"},
+            },
+            {
+                # Path style url
+                "url": "https://s3.us-east-1.amazonaws.com/bucket/key",
+                "result": {"Bucket": "bucket", "Key": "key"},
+            },
+        ]
+
+        invalid = [
+            # For purposes of exporter, we need S3 URLs to point to an object
+            # and not a bucket
+            "s3://foo",
+            "https://www.amazon.com",
+            "https://s3.us-east-1.amazonaws.com",
+        ]
+
+        for config in valid:
+            result = parse_s3_url(
+                config["url"], bucket_name_property="Bucket", object_key_property="Key", version_property="VersionId"
+            )
+
+            self.assertEqual(result, config["result"])
+
+        for url in invalid:
+            with self.assertRaises(ValueError):
+                parse_s3_url(url)

From 46f7e1fa1d81c4f5781ead085917a80de5a4e44f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Jun 2023 14:50:42 -0700
Subject: [PATCH 07/15] chore(deps): bump sympy from 1.10.1 to 1.12 in
 /requirements (#5338)

Bumps [sympy](https://github.com/sympy/sympy) from 1.10.1 to 1.12.
- [Release notes](https://github.com/sympy/sympy/releases)
- [Commits](https://github.com/sympy/sympy/compare/sympy-1.10.1...sympy-1.12)

---
updated-dependencies:
- dependency-name: sympy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: hnnasit <84355507+hnnasit@users.noreply.github.com>
---
 requirements/reproducible-mac.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
index c69964a4c7..24eb610b40 100644
--- a/requirements/reproducible-mac.txt
+++ b/requirements/reproducible-mac.txt
@@ -706,9 +706,9 @@ six==1.16.0 \
     #   junit-xml
     #   python-dateutil
     #   serverlessrepo
-sympy==1.10.1 \
-    --hash=sha256:5939eeffdf9e152172601463626c022a2c27e75cf6278de8d401d50c9d58787b \
-    --hash=sha256:df75d738930f6fe9ebe7034e59d56698f29e85f443f743e51e47df0caccc2130
+sympy==1.12 \
+    --hash=sha256:c3588cd4295d0c0f603d0f2ae780587e64e2efeedb3521e46b9bb1d08d184fa5 \
+    --hash=sha256:ebf595c8dac3e0fdc4152c51878b498396ec7f30e7a914d6071e674d49420fb8
     # via cfn-lint
 text-unidecode==1.3 \
     --hash=sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8 \

From 30336bcd7f420d3daf7ad70fbf7ff12e2fd19c8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Jun 2023 22:18:20 +0000
Subject: [PATCH 08/15] chore(deps): bump websocket-client from 1.5.1 to 1.6.1
 in /requirements (#5417)

Bumps [websocket-client](https://github.com/websocket-client/websocket-client) from 1.5.1 to 1.6.1.
- [Release notes](https://github.com/websocket-client/websocket-client/releases)
- [Changelog](https://github.com/websocket-client/websocket-client/blob/master/ChangeLog)
- [Commits](https://github.com/websocket-client/websocket-client/compare/v1.5.1...v1.6.1)

---
updated-dependencies:
- dependency-name: websocket-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements/reproducible-linux.txt | 6 +++---
 requirements/reproducible-mac.txt   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
index 6ad1ef3c90..65952aeeac 100644
--- a/requirements/reproducible-linux.txt
+++ b/requirements/reproducible-linux.txt
@@ -684,9 +684,9 @@ watchdog==2.1.2 \
     --hash=sha256:d34ce2261f118ecd57eedeef95fc2a495fc4a40b3ed7b3bf0bd7a8ccc1ab4f8f \
     --hash=sha256:edcd9ef3fd460bb8a98eb1fcf99941e9fd9f275f45f1a82cb1359ec92975d647
     # via aws-sam-cli (setup.py)
-websocket-client==1.5.1 \
-    --hash=sha256:3f09e6d8230892547132177f575a4e3e73cfdf06526e20cc02aa1c3b47184d40 \
-    --hash=sha256:cdf5877568b7e83aa7cf2244ab56a3213de587bbe0ce9d8b9600fc77b455d89e
+websocket-client==1.6.1 \
+    --hash=sha256:c951af98631d24f8df89ab1019fc365f2227c0892f12fd150e935607c79dd0dd \
+    --hash=sha256:f1f9f2ad5291f0225a49efad77abf9e700b6fef553900623060dad6e26503b9d
     # via docker
 werkzeug==2.2.3 \
     --hash=sha256:2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe \
diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
index 24eb610b40..ccd42b465a 100644
--- a/requirements/reproducible-mac.txt
+++ b/requirements/reproducible-mac.txt
@@ -762,9 +762,9 @@ watchdog==2.1.2 \
     --hash=sha256:d34ce2261f118ecd57eedeef95fc2a495fc4a40b3ed7b3bf0bd7a8ccc1ab4f8f \
     --hash=sha256:edcd9ef3fd460bb8a98eb1fcf99941e9fd9f275f45f1a82cb1359ec92975d647
     # via aws-sam-cli (setup.py)
-websocket-client==1.5.1 \
-    --hash=sha256:3f09e6d8230892547132177f575a4e3e73cfdf06526e20cc02aa1c3b47184d40 \
-    --hash=sha256:cdf5877568b7e83aa7cf2244ab56a3213de587bbe0ce9d8b9600fc77b455d89e
+websocket-client==1.6.1 \
+    --hash=sha256:c951af98631d24f8df89ab1019fc365f2227c0892f12fd150e935607c79dd0dd \
+    --hash=sha256:f1f9f2ad5291f0225a49efad77abf9e700b6fef553900623060dad6e26503b9d
     # via docker
 werkzeug==2.2.3 \
     --hash=sha256:2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe \

From 4336c7703c5dc611f8d8728fb94766a7d78f6716 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Jun 2023 22:34:04 +0000
Subject: [PATCH 09/15] chore(deps): bump ruamel-yaml from 0.17.21 to 0.17.32
 in /requirements (#5376)

* chore(deps): bump ruamel-yaml from 0.17.21 to 0.17.32 in /requirements

Bumps [ruamel-yaml](https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree) from 0.17.21 to 0.17.32.

---
updated-dependencies:
- dependency-name: ruamel-yaml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Pin ruamel-yaml-clib version

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: hnnasit <84355507+hnnasit@users.noreply.github.com>
Co-authored-by: Haresh Nasit <hnnasit@amazon.com>
---
 requirements/base.txt               |  2 +-
 requirements/reproducible-linux.txt | 45 +++++++++++++++++++++++++++--
 requirements/reproducible-mac.txt   |  6 ++--
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 34edac3fd0..f0626e7145 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -4,7 +4,7 @@ Flask<2.3
 #Need to add latest lambda changes which will return invoke mode details
 boto3>=1.26.109,==1.*
 jmespath~=1.0.1
-ruamel_yaml~=0.17.21
+ruamel_yaml~=0.17.32
 PyYAML>=5.4.1,==5.*
 cookiecutter~=2.1.1
 aws-sam-translator==1.70.0
diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
index 65952aeeac..f946536226 100644
--- a/requirements/reproducible-linux.txt
+++ b/requirements/reproducible-linux.txt
@@ -610,10 +610,49 @@ rich==13.3.3 \
     --hash=sha256:540c7d6d26a1178e8e8b37e9ba44573a3cd1464ff6348b99ee7061b95d1c6333 \
     --hash=sha256:dc84400a9d842b3a9c5ff74addd8eb798d155f36c1c91303888e0a66850d2a15
     # via aws-sam-cli (setup.py)
-ruamel-yaml==0.17.21 \
-    --hash=sha256:742b35d3d665023981bd6d16b3d24248ce5df75fdb4e2924e93a05c1f8b61ca7 \
-    --hash=sha256:8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af
+ruamel-yaml==0.17.32 \
+    --hash=sha256:23cd2ed620231677564646b0c6a89d138b6822a0d78656df7abda5879ec4f447 \
+    --hash=sha256:ec939063761914e14542972a5cba6d33c23b0859ab6342f61cf070cfc600efc2
     # via aws-sam-cli (setup.py)
+ruamel-yaml-clib==0.2.7 \
+    --hash=sha256:045e0626baf1c52e5527bd5db361bc83180faaba2ff586e763d3d5982a876a9e \
+    --hash=sha256:15910ef4f3e537eea7fe45f8a5d19997479940d9196f357152a09031c5be59f3 \
+    --hash=sha256:184faeaec61dbaa3cace407cffc5819f7b977e75360e8d5ca19461cd851a5fc5 \
+    --hash=sha256:1a6391a7cabb7641c32517539ca42cf84b87b667bad38b78d4d42dd23e957c81 \
+    --hash=sha256:1f08fd5a2bea9c4180db71678e850b995d2a5f4537be0e94557668cf0f5f9497 \
+    --hash=sha256:2aa261c29a5545adfef9296b7e33941f46aa5bbd21164228e833412af4c9c75f \
+    --hash=sha256:3110a99e0f94a4a3470ff67fc20d3f96c25b13d24c6980ff841e82bafe827cac \
+    --hash=sha256:3243f48ecd450eddadc2d11b5feb08aca941b5cd98c9b1db14b2fd128be8c697 \
+    --hash=sha256:370445fd795706fd291ab00c9df38a0caed0f17a6fb46b0f607668ecb16ce763 \
+    --hash=sha256:40d030e2329ce5286d6b231b8726959ebbe0404c92f0a578c0e2482182e38282 \
+    --hash=sha256:41d0f1fa4c6830176eef5b276af04c89320ea616655d01327d5ce65e50575c94 \
+    --hash=sha256:4a4d8d417868d68b979076a9be6a38c676eca060785abaa6709c7b31593c35d1 \
+    --hash=sha256:4b3a93bb9bc662fc1f99c5c3ea8e623d8b23ad22f861eb6fce9377ac07ad6072 \
+    --hash=sha256:5bc0667c1eb8f83a3752b71b9c4ba55ef7c7058ae57022dd9b29065186a113d9 \
+    --hash=sha256:763d65baa3b952479c4e972669f679fe490eee058d5aa85da483ebae2009d231 \
+    --hash=sha256:7bdb4c06b063f6fd55e472e201317a3bb6cdeeee5d5a38512ea5c01e1acbdd93 \
+    --hash=sha256:8831a2cedcd0f0927f788c5bdf6567d9dc9cc235646a434986a852af1cb54b4b \
+    --hash=sha256:91a789b4aa0097b78c93e3dc4b40040ba55bef518f84a40d4442f713b4094acb \
+    --hash=sha256:92460ce908546ab69770b2e576e4f99fbb4ce6ab4b245345a3869a0a0410488f \
+    --hash=sha256:99e77daab5d13a48a4054803d052ff40780278240a902b880dd37a51ba01a307 \
+    --hash=sha256:9c7617df90c1365638916b98cdd9be833d31d337dbcd722485597b43c4a215bf \
+    --hash=sha256:a234a20ae07e8469da311e182e70ef6b199d0fbeb6c6cc2901204dd87fb867e8 \
+    --hash=sha256:a7b301ff08055d73223058b5c46c55638917f04d21577c95e00e0c4d79201a6b \
+    --hash=sha256:be2a7ad8fd8f7442b24323d24ba0b56c51219513cfa45b9ada3b87b76c374d4b \
+    --hash=sha256:bf9a6bc4a0221538b1a7de3ed7bca4c93c02346853f44e1cd764be0023cd3640 \
+    --hash=sha256:c3ca1fbba4ae962521e5eb66d72998b51f0f4d0f608d3c0347a48e1af262efa7 \
+    --hash=sha256:d000f258cf42fec2b1bbf2863c61d7b8918d31ffee905da62dede869254d3b8a \
+    --hash=sha256:d5859983f26d8cd7bb5c287ef452e8aacc86501487634573d260968f753e1d71 \
+    --hash=sha256:d5e51e2901ec2366b79f16c2299a03e74ba4531ddcfacc1416639c557aef0ad8 \
+    --hash=sha256:da538167284de58a52109a9b89b8f6a53ff8437dd6dc26d33b57bf6699153122 \
+    --hash=sha256:debc87a9516b237d0466a711b18b6ebeb17ba9f391eb7f91c649c5c4ec5006c7 \
+    --hash=sha256:df5828871e6648db72d1c19b4bd24819b80a755c4541d3409f0f7acd0f335c80 \
+    --hash=sha256:ecdf1a604009bd35c674b9225a8fa609e0282d9b896c03dd441a91e5f53b534e \
+    --hash=sha256:efa08d63ef03d079dcae1dfe334f6c8847ba8b645d08df286358b1f5293d24ab \
+    --hash=sha256:f01da5790e95815eb5a8a138508c01c758e5f5bc0ce4286c4f7028b8dd7ac3d0 \
+    --hash=sha256:f34019dced51047d6f70cb9383b2ae2853b7fc4dce65129a5acd49f4f9256646 \
+    --hash=sha256:f6d3d39611ac2e4f62c3128a9eed45f19a6608670c5a2f4f07f24e8de3441d38
+    # via ruamel-yaml
 s3transfer==0.6.0 \
     --hash=sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd \
     --hash=sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947
diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
index ccd42b465a..8ec7ddf316 100644
--- a/requirements/reproducible-mac.txt
+++ b/requirements/reproducible-mac.txt
@@ -645,9 +645,9 @@ rich==13.3.3 \
     --hash=sha256:540c7d6d26a1178e8e8b37e9ba44573a3cd1464ff6348b99ee7061b95d1c6333 \
     --hash=sha256:dc84400a9d842b3a9c5ff74addd8eb798d155f36c1c91303888e0a66850d2a15
     # via aws-sam-cli (setup.py)
-ruamel-yaml==0.17.21 \
-    --hash=sha256:742b35d3d665023981bd6d16b3d24248ce5df75fdb4e2924e93a05c1f8b61ca7 \
-    --hash=sha256:8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af
+ruamel-yaml==0.17.32 \
+    --hash=sha256:23cd2ed620231677564646b0c6a89d138b6822a0d78656df7abda5879ec4f447 \
+    --hash=sha256:ec939063761914e14542972a5cba6d33c23b0859ab6342f61cf070cfc600efc2
     # via aws-sam-cli (setup.py)
 ruamel-yaml-clib==0.2.7 \
     --hash=sha256:045e0626baf1c52e5527bd5db361bc83180faaba2ff586e763d3d5982a876a9e \

From 359e43bb361c16edb4951a7f3d6bac5667c20a06 Mon Sep 17 00:00:00 2001
From: hnnasit <84355507+hnnasit@users.noreply.github.com>
Date: Thu, 29 Jun 2023 19:17:48 -0700
Subject: [PATCH 10/15] Updated package formatter to import package options
 instead of deploy (#5433)

Co-authored-by: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>
---
 samcli/commands/package/core/formatters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samcli/commands/package/core/formatters.py b/samcli/commands/package/core/formatters.py
index 3faca8d644..5c05ddcbfd 100644
--- a/samcli/commands/package/core/formatters.py
+++ b/samcli/commands/package/core/formatters.py
@@ -1,6 +1,6 @@
 from samcli.cli.formatters import RootCommandHelpTextFormatter
 from samcli.cli.row_modifiers import BaseLineRowModifier
-from samcli.commands.deploy.core.options import ALL_OPTIONS
+from samcli.commands.package.core.options import ALL_OPTIONS
 
 
 class PackageCommandHelpTextFormatter(RootCommandHelpTextFormatter):

From 5e8df69d2724b17de33704c633b76c5f89cc17d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 10:07:13 -0700
Subject: [PATCH 11/15] chore(deps): bump importlib-metadata in /requirements
 (#5437)

Bumps [importlib-metadata](https://github.com/python/importlib_metadata) from 6.1.0 to 6.7.0.
- [Release notes](https://github.com/python/importlib_metadata/releases)
- [Changelog](https://github.com/python/importlib_metadata/blob/main/NEWS.rst)
- [Commits](https://github.com/python/importlib_metadata/compare/v6.1.0...v6.7.0)

---
updated-dependencies:
- dependency-name: importlib-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements/reproducible-mac.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
index 8ec7ddf316..a1db7a41cf 100644
--- a/requirements/reproducible-mac.txt
+++ b/requirements/reproducible-mac.txt
@@ -267,9 +267,9 @@ idna==3.4 \
     --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
     --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
     # via requests
-importlib-metadata==6.1.0 \
-    --hash=sha256:43ce9281e097583d758c2c708c4376371261a02c34682491a8e98352365aad20 \
-    --hash=sha256:ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09
+importlib-metadata==6.7.0 \
+    --hash=sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4 \
+    --hash=sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5
     # via
     #   attrs
     #   click

From 9877db23f19968d320943810c8e43602bd13612f Mon Sep 17 00:00:00 2001
From: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>
Date: Mon, 3 Jul 2023 11:39:52 -0700
Subject: [PATCH 12/15] feat: `sam logs` help text (#5397)

* feat: `sam logs` help text

* fix: make ruff happy

* fix: address comments
---
 samcli/cli/root/command_list.py               |   4 +-
 samcli/commands/logs/command.py               |  52 ++++----
 samcli/commands/logs/core/__init__.py         |   0
 samcli/commands/logs/core/command.py          | 119 ++++++++++++++++++
 samcli/commands/logs/core/formatters.py       |  19 +++
 samcli/commands/logs/core/options.py          |  45 +++++++
 tests/unit/commands/logs/core/__init__.py     |   0
 tests/unit/commands/logs/core/test_command.py |  73 +++++++++++
 .../unit/commands/logs/core/test_formatter.py |  12 ++
 tests/unit/commands/logs/core/test_options.py |  12 ++
 10 files changed, 307 insertions(+), 29 deletions(-)
 create mode 100644 samcli/commands/logs/core/__init__.py
 create mode 100644 samcli/commands/logs/core/command.py
 create mode 100644 samcli/commands/logs/core/formatters.py
 create mode 100644 samcli/commands/logs/core/options.py
 create mode 100644 tests/unit/commands/logs/core/__init__.py
 create mode 100644 tests/unit/commands/logs/core/test_command.py
 create mode 100644 tests/unit/commands/logs/core/test_formatter.py
 create mode 100644 tests/unit/commands/logs/core/test_options.py

diff --git a/samcli/cli/root/command_list.py b/samcli/cli/root/command_list.py
index 0be843fbe2..cfa7000739 100644
--- a/samcli/cli/root/command_list.py
+++ b/samcli/cli/root/command_list.py
@@ -6,11 +6,11 @@
     "validate": "Validate an AWS SAM template.",
     "build": "Build your AWS serverless function code.",
     "local": "Run your AWS serverless function locally.",
-    "remote": "Invoke or send an event to cloud resources in your CFN stack",
+    "remote": "Invoke or send an event to cloud resources in your AWS Cloudformation stack.",
     "package": "Package an AWS SAM application.",
     "deploy": "Deploy an AWS SAM application.",
     "delete": "Delete an AWS SAM application and the artifacts created by sam deploy.",
-    "logs": "Fetch AWS Cloudwatch logs for a function.",
+    "logs": "Fetch AWS Cloudwatch logs for AWS Lambda Functions or Cloudwatch Log groups.",
     "publish": "Publish a packaged AWS SAM template to AWS Serverless Application Repository for easy sharing.",
     "traces": "Fetch AWS X-Ray traces.",
     "sync": "Sync an AWS SAM project to AWS.",
diff --git a/samcli/commands/logs/command.py b/samcli/commands/logs/command.py
index 7a3b1d8c6a..1146767a60 100644
--- a/samcli/commands/logs/command.py
+++ b/samcli/commands/logs/command.py
@@ -11,6 +11,7 @@
 from samcli.cli.main import common_options as cli_framework_options
 from samcli.commands._utils.command_exception_handler import command_exception_handler
 from samcli.commands._utils.options import common_observability_options, generate_next_command_recommendation
+from samcli.commands.logs.core.command import LogsCommand
 from samcli.commands.logs.validation_and_exception_handlers import (
     SAM_LOGS_ADDITIONAL_EXCEPTION_HANDLERS,
     stack_name_cw_log_group_validation,
@@ -20,37 +21,34 @@
 
 LOG = logging.getLogger(__name__)
 
+SHORT_HELP = (
+    "Fetch logs for your AWS SAM Application or AWS Cloudformation stack - Lambda Functions/CloudWatch Log groups"
+)
+
 HELP_TEXT = """
-Use this command to fetch logs generated by your Lambda function.\n
-\b
-When your functions are a part of a CloudFormation stack, you can fetch logs using the function's
-LogicalID when you specify the stack name.
-$ sam logs -n HelloWorldFunction --stack-name mystack \n
-\b
-Or, you can fetch logs using the function's name.
-$ sam logs -n mystack-HelloWorldFunction-1FJ8PD36GML2Q \n
-\b
-You can view logs for a specific time range using the -s (--start-time) and -e (--end-time) options
-$ sam logs -n HelloWorldFunction --stack-name mystack -s '10min ago' -e '2min ago' \n
-\b
-You can also add the --tail option to wait for new logs and see them as they arrive.
-$ sam logs -n HelloWorldFunction --stack-name mystack --tail \n
-\b
-Use the --filter option to quickly find logs that match terms, phrases or values in your log events.
-$ sam logs -n HelloWorldFunction --stack-name mystack --filter 'error' \n
-\b
-Fetch logs for all supported resources in your application, and additionally from the specified log groups.
-$ sam logs --cw-log-group /aws/lambda/myfunction-123 --cw-log-group /aws/lambda/myfunction-456
-\b
-You can now fetch logs from supported resources, by only providing --stack-name parameter
-$ sam logs --stack-name mystack \n
-\b
-You can also fetch logs from a resource which is defined in a nested stack.
-$ sam logs --stack-name mystack -n MyNestedStack/HelloWorldFunction
+The sam logs commands fetches logs of Lambda Functions/CloudWatch log groups
+with additional filtering by options.
 """
 
+DESCRIPTION = """
+  Fetch logs generated by Lambda functions or other Cloudwatch log groups with additional filtering.
+"""
 
-@click.command("logs", help=HELP_TEXT, short_help="Fetch logs for a function")
+
+@click.command(
+    "logs",
+    short_help=SHORT_HELP,
+    context_settings={
+        "ignore_unknown_options": False,
+        "allow_interspersed_args": True,
+        "allow_extra_args": True,
+        "max_content_width": 120,
+    },
+    cls=LogsCommand,
+    help=HELP_TEXT,
+    description=DESCRIPTION,
+    requires_credentials=True,
+)
 @configuration_option(provider=TomlProvider(section="parameters"))
 @click.option(
     "--name",
diff --git a/samcli/commands/logs/core/__init__.py b/samcli/commands/logs/core/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/logs/core/command.py b/samcli/commands/logs/core/command.py
new file mode 100644
index 0000000000..60b1734e50
--- /dev/null
+++ b/samcli/commands/logs/core/command.py
@@ -0,0 +1,119 @@
+from click import Context, style
+
+from samcli.cli.core.command import CoreCommand
+from samcli.cli.row_modifiers import RowDefinition, ShowcaseRowModifier
+from samcli.commands.logs.core.formatters import LogsCommandHelpTextFormatter
+from samcli.commands.logs.core.options import OPTIONS_INFO
+
+COL_SIZE_MODIFIER = 38
+
+
+class LogsCommand(CoreCommand):
+    class CustomFormatterContext(Context):
+        formatter_class = LogsCommandHelpTextFormatter
+
+    context_class = CustomFormatterContext
+
+    @staticmethod
+    def format_examples(ctx: Context, formatter: LogsCommandHelpTextFormatter):
+        with formatter.indented_section(name="Examples", extra_indents=1):
+            with formatter.indented_section(
+                name="Fetch logs with Lambda Function Logical ID and Cloudformation Stack Name"
+            ):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(f"$ {ctx.command_path} -n HelloWorldFunction --stack-name mystack"),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ]
+                )
+            with formatter.indented_section(name="View logs for specific time range"):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(
+                                f"$ {ctx.command_path} -n HelloWorldFunction --stack-name mystack -s "
+                                f"'10min ago' -e '2min ago'"
+                            ),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ]
+                )
+            with formatter.indented_section(name="Tail new logs"):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(f"$ {ctx.command_path} -n HelloWorldFunction --stack-name " f"mystack --tail"),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ]
+                )
+            with formatter.indented_section(name="Fetch from Cloudwatch log groups"):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(
+                                f"$ {ctx.command_path} --cw-log-group /aws/lambda/myfunction-123 "
+                                f"--cw-log-group /aws/lambda/myfunction-456"
+                            ),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ]
+                )
+
+            with formatter.indented_section(name="Fetch logs from supported resources in Cloudformation stack"):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(f"$ {ctx.command_path} ---stack-name mystack"),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ]
+                )
+
+            with formatter.indented_section(name="Fetch logs from resource defined in nested Cloudformation stack"):
+                formatter.write_rd(
+                    [
+                        RowDefinition(
+                            text="\n",
+                        ),
+                        RowDefinition(
+                            name=style(
+                                f"$ {ctx.command_path} ---stack-name mystack -n MyNestedStack/HelloWorldFunction"
+                            ),
+                            extra_row_modifiers=[ShowcaseRowModifier()],
+                        ),
+                    ]
+                )
+
+    def format_options(self, ctx: Context, formatter: LogsCommandHelpTextFormatter) -> None:  # type:ignore
+        # `ignore` is put in place here for mypy even though it is the correct behavior,
+        # as the `formatter_class` can be set in subclass of Command. If ignore is not set,
+        # mypy raises argument needs to be HelpFormatter as super class defines it.
+
+        self.format_description(formatter)
+        LogsCommand.format_examples(ctx, formatter)
+
+        CoreCommand._format_options(
+            ctx=ctx,
+            params=self.get_params(ctx),
+            formatter=formatter,
+            formatting_options=OPTIONS_INFO,
+            write_rd_overrides={"col_max": COL_SIZE_MODIFIER},
+        )
diff --git a/samcli/commands/logs/core/formatters.py b/samcli/commands/logs/core/formatters.py
new file mode 100644
index 0000000000..6a35facce0
--- /dev/null
+++ b/samcli/commands/logs/core/formatters.py
@@ -0,0 +1,19 @@
+from samcli.cli.formatters import RootCommandHelpTextFormatter
+from samcli.cli.row_modifiers import BaseLineRowModifier
+from samcli.commands.logs.core.options import ALL_OPTIONS
+
+
+class LogsCommandHelpTextFormatter(RootCommandHelpTextFormatter):
+    # Picked an additive constant that gives an aesthetically pleasing look.
+    ADDITIVE_JUSTIFICATION = 22
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Add Additional space after determining the longest option.
+        # However, do not justify with padding for more than half the width of
+        # the terminal to retain aesthetics.
+        self.left_justification_length = min(
+            max([len(option) for option in ALL_OPTIONS]) + self.ADDITIVE_JUSTIFICATION,
+            self.width // 2 - self.indent_increment,
+        )
+        self.modifiers = [BaseLineRowModifier()]
diff --git a/samcli/commands/logs/core/options.py b/samcli/commands/logs/core/options.py
new file mode 100644
index 0000000000..c537c857e6
--- /dev/null
+++ b/samcli/commands/logs/core/options.py
@@ -0,0 +1,45 @@
+"""
+Logs Command Options related Datastructures for formatting.
+"""
+from typing import Dict, List
+
+from samcli.cli.core.options import ALL_COMMON_OPTIONS, add_common_options_info
+from samcli.cli.row_modifiers import RowDefinition
+
+# The ordering of the option lists matter, they are the order in which options will be displayed.
+
+LOG_IDENTIFIER_OPTIONS: List[str] = ["stack_name", "cw_log_group", "name"]
+
+# Can be used instead of the options in the first list
+ADDITIONAL_OPTIONS: List[str] = ["include_traces", "filter", "output", "tail", "start_time", "end_time"]
+
+AWS_CREDENTIAL_OPTION_NAMES: List[str] = ["region", "profile"]
+
+CONFIGURATION_OPTION_NAMES: List[str] = ["config_env", "config_file"]
+
+ALL_OPTIONS: List[str] = (
+    LOG_IDENTIFIER_OPTIONS
+    + AWS_CREDENTIAL_OPTION_NAMES
+    + ADDITIONAL_OPTIONS
+    + CONFIGURATION_OPTION_NAMES
+    + ALL_COMMON_OPTIONS
+)
+
+OPTIONS_INFO: Dict[str, Dict] = {
+    "Log Identifier Options": {"option_names": {opt: {"rank": idx} for idx, opt in enumerate(LOG_IDENTIFIER_OPTIONS)}},
+    "AWS Credential Options": {
+        "option_names": {opt: {"rank": idx} for idx, opt in enumerate(AWS_CREDENTIAL_OPTION_NAMES)}
+    },
+    "Additional Options": {"option_names": {opt: {"rank": idx} for idx, opt in enumerate(ADDITIONAL_OPTIONS)}},
+    "Configuration Options": {
+        "option_names": {opt: {"rank": idx} for idx, opt in enumerate(CONFIGURATION_OPTION_NAMES)},
+        "extras": [
+            RowDefinition(name="Learn more about configuration files at:"),
+            RowDefinition(
+                name="https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli"
+                "-config.html. "
+            ),
+        ],
+    },
+}
+add_common_options_info(OPTIONS_INFO)
diff --git a/tests/unit/commands/logs/core/__init__.py b/tests/unit/commands/logs/core/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/logs/core/test_command.py b/tests/unit/commands/logs/core/test_command.py
new file mode 100644
index 0000000000..5b7b4e334e
--- /dev/null
+++ b/tests/unit/commands/logs/core/test_command.py
@@ -0,0 +1,73 @@
+import unittest
+from unittest.mock import Mock, patch
+from samcli.commands.logs.core.command import LogsCommand
+from samcli.commands.logs.command import DESCRIPTION
+from tests.unit.cli.test_command import MockFormatter
+
+
+class MockParams:
+    def __init__(self, rv, name):
+        self.rv = rv
+        self.name = name
+
+    def get_help_record(self, ctx):
+        return self.rv
+
+
+class TestLogsCommand(unittest.TestCase):
+    @patch.object(LogsCommand, "get_params")
+    def test_get_options_logs_command_text(self, mock_get_params):
+        ctx = Mock()
+        ctx.command_path = "sam logs"
+        ctx.parent.command_path = "sam"
+        formatter = MockFormatter(scrub_text=True)
+        # NOTE(sriram-mv): One option per option section.
+        mock_get_params.return_value = [
+            MockParams(rv=("--region", "Region"), name="region"),
+            MockParams(rv=("--debug", ""), name="debug"),
+            MockParams(rv=("--config-file", ""), name="config_file"),
+            MockParams(rv=("--stack-name", ""), name="stack_name"),
+            MockParams(rv=("--tail", ""), name="tail"),
+            MockParams(rv=("--beta-features", ""), name="beta_features"),
+        ]
+
+        cmd = LogsCommand(name="logs", requires_credentials=True, description=DESCRIPTION)
+        expected_output = {
+            "AWS Credential Options": [("", ""), ("--region", ""), ("", "")],
+            "Additional Options": [("", ""), ("--tail", ""), ("", "")],
+            "Beta Options": [("", ""), ("--beta-features", ""), ("", "")],
+            "Configuration Options": [("", ""), ("--config-file", ""), ("", "")],
+            "Description": [(cmd.description + cmd.description_addendum, "")],
+            "Examples": [],
+            "Fetch from Cloudwatch log groups": [
+                ("", ""),
+                (
+                    "$ sam logs --cw-log-group "
+                    "/aws/lambda/myfunction-123 "
+                    "--cw-log-group "
+                    "/aws/lambda/myfunction-456\x1b[0m",
+                    "",
+                ),
+            ],
+            "Fetch logs from resource defined in nested Cloudformation stack": [
+                ("", ""),
+                ("$ sam " "logs " "---stack-name " "mystack " "-n " "MyNestedStack/HelloWorldFunction\x1b[0m", ""),
+            ],
+            "Fetch logs from supported resources in Cloudformation stack": [
+                ("", ""),
+                ("$ sam logs " "---stack-name " "mystack\x1b[0m", ""),
+            ],
+            "Fetch logs with Lambda Function Logical ID and Cloudformation Stack Name": [
+                ("", ""),
+                ("$ " "sam " "logs " "-n " "HelloWorldFunction " "--stack-name " "mystack\x1b[0m", ""),
+            ],
+            "Log Identifier Options": [("", ""), ("--stack-name", ""), ("", "")],
+            "Other Options": [("", ""), ("--debug", ""), ("", "")],
+            "Tail new logs": [("", ""), ("$ sam logs -n HelloWorldFunction --stack-name mystack " "--tail\x1b[0m", "")],
+            "View logs for specific time range": [
+                ("", ""),
+                ("$ sam logs -n HelloWorldFunction " "--stack-name mystack -s '10min ago' " "-e '2min ago'\x1b[0m", ""),
+            ],
+        }
+        cmd.format_options(ctx, formatter)
+        self.assertEqual(formatter.data, expected_output)
diff --git a/tests/unit/commands/logs/core/test_formatter.py b/tests/unit/commands/logs/core/test_formatter.py
new file mode 100644
index 0000000000..e59e90207b
--- /dev/null
+++ b/tests/unit/commands/logs/core/test_formatter.py
@@ -0,0 +1,12 @@
+from shutil import get_terminal_size
+from unittest import TestCase
+
+from samcli.cli.row_modifiers import BaseLineRowModifier
+from samcli.commands.logs.core.formatters import LogsCommandHelpTextFormatter
+
+
+class TestLogsCommandHelpTextFormatter(TestCase):
+    def test_logs_formatter(self):
+        self.formatter = LogsCommandHelpTextFormatter()
+        self.assertTrue(self.formatter.left_justification_length <= get_terminal_size().columns // 2)
+        self.assertIsInstance(self.formatter.modifiers[0], BaseLineRowModifier)
diff --git a/tests/unit/commands/logs/core/test_options.py b/tests/unit/commands/logs/core/test_options.py
new file mode 100644
index 0000000000..4b2acd844e
--- /dev/null
+++ b/tests/unit/commands/logs/core/test_options.py
@@ -0,0 +1,12 @@
+from unittest import TestCase
+
+from click import Option
+
+from samcli.commands.logs.command import cli
+from samcli.commands.logs.core.options import ALL_OPTIONS
+
+
+class TestOptions(TestCase):
+    def test_all_options_formatted(self):
+        command_options = [param.human_readable_name if isinstance(param, Option) else None for param in cli.params]
+        self.assertEqual(sorted(ALL_OPTIONS), sorted(filter(lambda item: item is not None, command_options + ["help"])))

From c53db02e84e6565a92fcff66c9f5669b53838c85 Mon Sep 17 00:00:00 2001
From: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>
Date: Mon, 3 Jul 2023 12:02:34 -0700
Subject: [PATCH 13/15] feat: enable terraform support for local start-api
 command (#5389)

* feat: Enable hook-name and skip-prepare-infra flagf for sam local start-api (#5217)

* Enable hook-name flag for sam local start-api

* Format files

* test: Terraform local start-api integration tests base (#5240)

* feat: update SAM CLI with latest App Templates commit hash (#5211)

* feat: updating app templates repo hash with (a34f563f067e13df3eb350d36461b99397b6cda6)

* dummy change to trigger checks

* revert dummy commit

---------

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* Enable hook-name flag for sam local start-api

* Format files

* fix: fix failing Terraform integration test cases (#5218)

* fix: fix the failing terraform integration test cases

* fix: fix the resource address while accessing the module config resources

* fix: fix checking the experimental log integration test cases

* chore: bump version to 1.85.0 (#5226)

* chore: use the SAR Application created in testing accounts (#5221)

* chore: update aws_lambda_builders to 1.32.0 (#5215)

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* feat: Added linking Gateway Method to Lambda Authorizer (#5228)

* Added linking method to authorizer

* Fixed docstring spelling mistake

---------

Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* feat: Return early during linking if no destination resources are found (#5220)

* Returns during linking if no destination resources are found

* Updated comment to correctly reflect state

* Cleaned extra word

---------

Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* chore: Strengthen wording on "no Auth" during deploy (#5231)

Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>

* feat: Link Lambda Authorizer to Rest API (#5219)

* Link RestApiId property for Lambda Authorizers

* Updated docstring

* Format files

---------

Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* Terraform start-api integration tests

* Add test files

* Uncomment skip

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>
Co-authored-by: Lucas <12496191+lucashuy@users.noreply.github.com>
Co-authored-by: Jacob Fuss <32497805+jfuss@users.noreply.github.com>
Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>

* feat: Added OpenApi body integration testing and updated property builder (#5291)

* Added OpenApi body integration testing and updated property builder

* Added more test cases

* Changed tearDown to tearDownClass

* Updated JSON body parser to handle parsing errors and added unit tests

* Removed V1 references

* feat: Terraform Authorizer resource testing (#5270)

* Added authorizer project

* Added project files

* Removed extra print

* Add request based authorizer testing

* test: Test the unsupported limitations for local start api (#5309)

* test: Test the unsupported limitations for local start api

* fix lint issues

* apply pr comments

* fix: Bug Bash UX Issues (#5387)

* Fix bug bash UX issues

* Fix beta warning printing extra characters

* Fix authorizer logging

---------

Co-authored-by: Daniel Mil <84205762+mildaniel@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Lucas <12496191+lucashuy@users.noreply.github.com>
Co-authored-by: Jacob Fuss <32497805+jfuss@users.noreply.github.com>
Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>
---
 samcli/commands/_utils/experimental.py        |   4 +-
 samcli/commands/local/start_api/cli.py        |  40 ++-
 .../commands/local/start_api/core/options.py  |   4 +
 .../hooks/prepare/property_builder.py         |  36 ++-
 .../hooks/prepare/resources/apigw.py          |   2 +-
 .../terraform/hooks/prepare/translate.py      |  11 +-
 samcli/lib/providers/api_collector.py         |   4 +-
 .../local/start_api/start_api_integ_base.py   |  12 +-
 ...st_start_api_with_terraform_application.py | 268 ++++++++++++++++++
 .../lambda-auth-openapi/lambda-functions.zip  | Bin 0 -> 551 bytes
 .../terraform/lambda-auth-openapi/main.tf     | 112 ++++++++
 .../HelloWorldFunction.zip                    | Bin 0 -> 1079 bytes
 .../main.tf                                   | 136 +++++++++
 .../HelloWorldFunction.zip                    | Bin 0 -> 1079 bytes
 .../main.tf                                   | 138 +++++++++
 .../HelloWorldFunction.zip                    | Bin 0 -> 1079 bytes
 .../terraform/terraform-v1-api-simple/main.tf | 112 ++++++++
 .../v1-lambda-authorizer/lambda-functions.zip | Bin 0 -> 551 bytes
 .../terraform/v1-lambda-authorizer/main.tf    | 139 +++++++++
 .../local/start_api/core/test_command.py      |   2 +
 .../unit/commands/local/start_api/test_cli.py |   3 +
 .../unit/commands/samconfig/test_samconfig.py |   1 +
 .../hooks/prepare/resources/test_apigw.py     |   1 +
 .../hooks/prepare/test_property_builder.py    |  20 ++
 .../terraform/hooks/prepare/test_translate.py |  11 +-
 25 files changed, 1032 insertions(+), 24 deletions(-)
 create mode 100644 tests/integration/local/start_api/test_start_api_with_terraform_application.py
 create mode 100644 tests/integration/testdata/start_api/terraform/lambda-auth-openapi/lambda-functions.zip
 create mode 100644 tests/integration/testdata/start_api/terraform/lambda-auth-openapi/main.tf
 create mode 100644 tests/integration/testdata/start_api/terraform/terraform-api-simple-local-variables-limitation/HelloWorldFunction.zip
 create mode 100644 tests/integration/testdata/start_api/terraform/terraform-api-simple-local-variables-limitation/main.tf
 create mode 100644 tests/integration/testdata/start_api/terraform/terraform-api-simple-multiple-resources-limitation/HelloWorldFunction.zip
 create mode 100644 tests/integration/testdata/start_api/terraform/terraform-api-simple-multiple-resources-limitation/main.tf
 create mode 100644 tests/integration/testdata/start_api/terraform/terraform-v1-api-simple/HelloWorldFunction.zip
 create mode 100644 tests/integration/testdata/start_api/terraform/terraform-v1-api-simple/main.tf
 create mode 100644 tests/integration/testdata/start_api/terraform/v1-lambda-authorizer/lambda-functions.zip
 create mode 100644 tests/integration/testdata/start_api/terraform/v1-lambda-authorizer/main.tf

diff --git a/samcli/commands/_utils/experimental.py b/samcli/commands/_utils/experimental.py
index 240c5b80da..b8b75570c1 100644
--- a/samcli/commands/_utils/experimental.py
+++ b/samcli/commands/_utils/experimental.py
@@ -10,7 +10,7 @@
 from samcli.cli.context import Context
 from samcli.cli.global_config import ConfigEntry, GlobalConfig
 from samcli.commands._utils.parameterized_option import parameterized_option
-from samcli.lib.utils.colors import Colored
+from samcli.lib.utils.colors import Colored, Colors
 
 LOG = logging.getLogger(__name__)
 
@@ -162,7 +162,7 @@ def update_experimental_context(show_warning=True):
     if not Context.get_current_context().experimental:
         Context.get_current_context().experimental = True
         if show_warning:
-            LOG.warning(Colored().yellow(EXPERIMENTAL_WARNING))
+            LOG.warning(Colored().color_log(EXPERIMENTAL_WARNING, color=Colors.WARNING), extra=dict(markup=True))
 
 
 def _experimental_option_callback(ctx, param, enabled: Optional[bool]):
diff --git a/samcli/commands/local/start_api/cli.py b/samcli/commands/local/start_api/cli.py
index 145b0a58a2..9de4d7982c 100644
--- a/samcli/commands/local/start_api/cli.py
+++ b/samcli/commands/local/start_api/cli.py
@@ -9,8 +9,13 @@
 from samcli.cli.cli_config_file import TomlProvider, configuration_option
 from samcli.cli.main import aws_creds_options, pass_context, print_cmdline_args
 from samcli.cli.main import common_options as cli_framework_options
+from samcli.commands._utils.experimental import ExperimentalFlag, is_experimental_enabled
 from samcli.commands._utils.option_value_processor import process_image_options
-from samcli.commands._utils.options import generate_next_command_recommendation
+from samcli.commands._utils.options import (
+    generate_next_command_recommendation,
+    hook_name_click_option,
+    skip_prepare_infra_option,
+)
 from samcli.commands.local.cli_common.options import (
     invoke_common_options,
     local_common_options,
@@ -54,6 +59,10 @@
     context_settings={"max_content_width": 120},
 )
 @configuration_option(provider=TomlProvider(section="parameters"))
+@hook_name_click_option(
+    force_prepare=False, invalid_coexist_options=["t", "template-file", "template", "parameter-overrides"]
+)
+@skip_prepare_infra_option
 @service_common_options(3000)
 @click.option(
     "--static-dir",
@@ -98,6 +107,8 @@ def cli(
     container_host,
     container_host_interface,
     invoke_image,
+    hook_name,
+    skip_prepare_infra,
 ):
     """
     `sam local start-api` command entry point
@@ -128,6 +139,7 @@ def cli(
         container_host,
         container_host_interface,
         invoke_image,
+        hook_name,
     )  # pragma: no cover
 
 
@@ -155,6 +167,7 @@ def do_cli(  # pylint: disable=R0914
     container_host,
     container_host_interface,
     invoke_image,
+    hook_name,
 ):
     """
     Implementation of the ``cli`` method, just separated out for unit testing purposes
@@ -170,6 +183,14 @@ def do_cli(  # pylint: disable=R0914
 
     LOG.debug("local start-api command is called")
 
+    if (
+        hook_name
+        and ExperimentalFlag.IaCsSupport.get(hook_name) is not None
+        and not is_experimental_enabled(ExperimentalFlag.IaCsSupport.get(hook_name))
+    ):
+        LOG.info("Terraform Support beta feature is not enabled.")
+        return
+
     processed_invoke_images = process_image_options(invoke_image)
 
     # Pass all inputs to setup necessary context to invoke function locally.
@@ -202,14 +223,15 @@ def do_cli(  # pylint: disable=R0914
         ) as invoke_context:
             service = LocalApiService(lambda_invoke_context=invoke_context, port=port, host=host, static_dir=static_dir)
             service.start()
-            command_suggestions = generate_next_command_recommendation(
-                [
-                    ("Validate SAM template", "sam validate"),
-                    ("Test Function in the Cloud", "sam sync --stack-name {{stack-name}} --watch"),
-                    ("Deploy", "sam deploy --guided"),
-                ]
-            )
-            click.secho(command_suggestions, fg="yellow")
+            if not hook_name:
+                command_suggestions = generate_next_command_recommendation(
+                    [
+                        ("Validate SAM template", "sam validate"),
+                        ("Test Function in the Cloud", "sam sync --stack-name {{stack-name}} --watch"),
+                        ("Deploy", "sam deploy --guided"),
+                    ]
+                )
+                click.secho(command_suggestions, fg="yellow")
 
     except NoApisDefined as ex:
         raise UserException(
diff --git a/samcli/commands/local/start_api/core/options.py b/samcli/commands/local/start_api/core/options.py
index d9b89145e0..21bb1bf822 100644
--- a/samcli/commands/local/start_api/core/options.py
+++ b/samcli/commands/local/start_api/core/options.py
@@ -17,6 +17,8 @@
     "parameter_overrides",
 ]
 
+EXTENSION_OPTIONS: List[str] = ["hook_name", "skip_prepare_infra"]
+
 CONTAINER_OPTION_NAMES: List[str] = [
     "host",
     "port",
@@ -53,6 +55,7 @@
     + ARTIFACT_LOCATION_OPTIONS
     + CONFIGURATION_OPTION_NAMES
     + ALL_COMMON_OPTIONS
+    + EXTENSION_OPTIONS
 )
 
 OPTIONS_INFO: Dict[str, Dict] = {
@@ -65,6 +68,7 @@
     "Artifact Location Options": {
         "option_names": {opt: {"rank": idx} for idx, opt in enumerate(ARTIFACT_LOCATION_OPTIONS)}
     },
+    "Extension Options": {"option_names": {opt: {"rank": idx} for idx, opt in enumerate(EXTENSION_OPTIONS)}},
     "Configuration Options": {
         "option_names": {opt: {"rank": idx} for idx, opt in enumerate(CONFIGURATION_OPTION_NAMES)},
         "extras": [
diff --git a/samcli/hook_packages/terraform/hooks/prepare/property_builder.py b/samcli/hook_packages/terraform/hooks/prepare/property_builder.py
index add29c68b2..a8910f112a 100644
--- a/samcli/hook_packages/terraform/hooks/prepare/property_builder.py
+++ b/samcli/hook_packages/terraform/hooks/prepare/property_builder.py
@@ -1,6 +1,9 @@
 """
 Terraform prepare property builder
 """
+import logging
+from json import loads
+from json.decoder import JSONDecodeError
 from typing import Any, Dict, Optional
 
 from samcli.hook_packages.terraform.hooks.prepare.resource_linking import _resolve_resource_attribute
@@ -24,6 +27,8 @@
 from samcli.lib.utils.resources import AWS_LAMBDA_FUNCTION as CFN_AWS_LAMBDA_FUNCTION
 from samcli.lib.utils.resources import AWS_LAMBDA_LAYERVERSION as CFN_AWS_LAMBDA_LAYER_VERSION
 
+LOG = logging.getLogger(__name__)
+
 REMOTE_DUMMY_VALUE = "<<REMOTE DUMMY VALUE - RAISE ERROR IF IT IS STILL THERE>>"
 TF_AWS_LAMBDA_FUNCTION = "aws_lambda_function"
 TF_AWS_LAMBDA_LAYER_VERSION = "aws_lambda_layer_version"
@@ -211,6 +216,35 @@ def _check_image_config_value(image_config: Any) -> bool:
     return True
 
 
+def _get_json_body(tf_properties: dict, resource: TFResource) -> Any:
+    """
+    Gets the JSON formatted body value from the API Gateway if there is one
+
+    Parameters
+    ----------
+    tf_properties: dict
+        Properties of the terraform AWS Lambda function resource
+    resource: TFResource
+        Configuration terraform resource
+
+    Returns
+    -------
+    Any
+        Returns a dictonary if there is a valid body to parse, otherwise return original value
+    """
+    body = tf_properties.get("body")
+
+    if isinstance(body, str):
+        try:
+            return loads(body)
+        except JSONDecodeError:
+            pass
+
+    LOG.debug(f"Failed to load JSON body for API Gateway body, returning original value: '{body}'")
+
+    return body
+
+
 AWS_LAMBDA_FUNCTION_PROPERTY_BUILDER_MAPPING: PropertyBuilderMapping = {
     "FunctionName": _get_property_extractor("function_name"),
     "Architectures": _get_property_extractor("architectures"),
@@ -234,7 +268,7 @@ def _check_image_config_value(image_config: Any) -> bool:
 
 AWS_API_GATEWAY_REST_API_PROPERTY_BUILDER_MAPPING: PropertyBuilderMapping = {
     "Name": _get_property_extractor("name"),
-    "Body": _get_property_extractor("body"),
+    "Body": _get_json_body,
     "Parameters": _get_property_extractor("parameters"),
     "BinaryMediaTypes": _get_property_extractor("binary_media_types"),
 }
diff --git a/samcli/hook_packages/terraform/hooks/prepare/resources/apigw.py b/samcli/hook_packages/terraform/hooks/prepare/resources/apigw.py
index 05f1676624..356c744e12 100644
--- a/samcli/hook_packages/terraform/hooks/prepare/resources/apigw.py
+++ b/samcli/hook_packages/terraform/hooks/prepare/resources/apigw.py
@@ -66,7 +66,7 @@ def _unsupported_reference_field(field: str, resource: Dict, config_resource: TF
         False otherwise
     """
     return bool(
-        not resource.get(field)
+        not (resource.get(field) or resource.get("values", {}).get(field))
         and config_resource.attributes.get(field)
         and isinstance(config_resource.attributes.get(field), References)
     )
diff --git a/samcli/hook_packages/terraform/hooks/prepare/translate.py b/samcli/hook_packages/terraform/hooks/prepare/translate.py
index 62f8d4da12..14f9e73733 100644
--- a/samcli/hook_packages/terraform/hooks/prepare/translate.py
+++ b/samcli/hook_packages/terraform/hooks/prepare/translate.py
@@ -52,7 +52,7 @@
     get_sam_metadata_planned_resource_value_attribute,
 )
 from samcli.lib.hook.exceptions import PrepareHookException
-from samcli.lib.utils.colors import Colored
+from samcli.lib.utils.colors import Colored, Colors
 from samcli.lib.utils.resources import AWS_LAMBDA_FUNCTION as CFN_AWS_LAMBDA_FUNCTION
 
 SAM_METADATA_RESOURCE_TYPE = "null_resource"
@@ -134,9 +134,12 @@ def _check_unresolvable_values(root_module: dict, root_tf_module: TFModule) -> N
 
                 if config_values and not planned_values:
                     LOG.warning(
-                        Colored().yellow(
-                            "\nUnresolvable attributes discovered in project, run terraform apply to resolve them.\n"
-                        )
+                        Colored().color_log(
+                            msg="\nUnresolvable attributes discovered in project, "
+                            "run terraform apply to resolve them.\n",
+                            color=Colors.WARNING,
+                        ),
+                        extra=dict(markup=True),
                     )
 
                     return
diff --git a/samcli/lib/providers/api_collector.py b/samcli/lib/providers/api_collector.py
index d0c0f5b2a8..7cb5d0c1d1 100644
--- a/samcli/lib/providers/api_collector.py
+++ b/samcli/lib/providers/api_collector.py
@@ -9,7 +9,7 @@
 from typing import Dict, Iterator, List, Optional, Set, Tuple, Union
 
 from samcli.lib.providers.provider import Api, Cors
-from samcli.lib.utils.colors import Colored
+from samcli.lib.utils.colors import Colored, Colors
 from samcli.local.apigw.authorizers.authorizer import Authorizer
 from samcli.local.apigw.route import Route
 
@@ -197,7 +197,7 @@ def get_api(self) -> Api:
 be validated thoroughly before deploying to production.
 
 Testing application behaviour against authorizers deployed on AWS can be done using the sam sync command.{os.linesep}"""
-                LOG.warning(Colored().yellow(message))
+                LOG.warning(Colored().color_log(message, color=Colors.WARNING), extra=dict(markup=True))
 
                 break
 
diff --git a/tests/integration/local/start_api/start_api_integ_base.py b/tests/integration/local/start_api/start_api_integ_base.py
index b1f9a6a785..77f755aec8 100644
--- a/tests/integration/local/start_api/start_api_integ_base.py
+++ b/tests/integration/local/start_api/start_api_integ_base.py
@@ -33,6 +33,9 @@ class StartApiIntegBaseClass(TestCase):
 
     do_collect_cmd_init_output: bool = False
 
+    command_list = None
+    project_directory = None
+
     @classmethod
     def setUpClass(cls):
         # This is the directory for tests/integration which will be used to file the testdata
@@ -84,7 +87,8 @@ def start_api_with_retry(cls, retries=3):
     def start_api(cls):
         command = get_sam_command()
 
-        command_list = [command, "local", "start-api", "-t", cls.template, "-p", cls.port]
+        command_list = cls.command_list or [command, "local", "start-api", "-t", cls.template]
+        command_list.extend(["-p", cls.port])
 
         if cls.container_mode:
             command_list += ["--warm-containers", cls.container_mode]
@@ -99,7 +103,11 @@ def start_api(cls):
             for image in cls.invoke_image:
                 command_list += ["--invoke-image", image]
 
-        cls.start_api_process = Popen(command_list, stderr=PIPE, stdout=PIPE)
+        cls.start_api_process = (
+            Popen(command_list, stderr=PIPE, stdout=PIPE)
+            if not cls.project_directory
+            else Popen(command_list, stderr=PIPE, stdout=PIPE, cwd=cls.project_directory)
+        )
         cls.start_api_process_output = wait_for_local_process(
             cls.start_api_process, cls.port, collect_output=cls.do_collect_cmd_init_output
         )
diff --git a/tests/integration/local/start_api/test_start_api_with_terraform_application.py b/tests/integration/local/start_api/test_start_api_with_terraform_application.py
new file mode 100644
index 0000000000..e8ab21d01d
--- /dev/null
+++ b/tests/integration/local/start_api/test_start_api_with_terraform_application.py
@@ -0,0 +1,268 @@
+import logging
+import shutil
+import os
+from pathlib import Path
+from subprocess import CalledProcessError, CompletedProcess, run
+from typing import Optional
+from unittest import skipIf
+from parameterized import parameterized, parameterized_class
+
+import pytest
+import requests
+
+from tests.integration.local.common_utils import random_port
+from tests.integration.local.start_api.start_api_integ_base import StartApiIntegBaseClass
+from tests.testing_utils import get_sam_command, CI_OVERRIDE
+
+LOG = logging.getLogger(__name__)
+
+
+class TerraformStartApiIntegrationBase(StartApiIntegBaseClass):
+    run_command_timeout = 300
+    terraform_application: Optional[str] = None
+
+    @classmethod
+    def setUpClass(cls):
+        command = get_sam_command()
+        cls.template_path = ""
+        cls.build_before_invoke = False
+        cls.command_list = [command, "local", "start-api", "--hook-name", "terraform", "--beta-features"]
+        cls.test_data_path = Path(cls.get_integ_dir()) / "testdata" / "start_api"
+        cls.project_directory = cls.test_data_path / "terraform" / cls.terraform_application
+        super(TerraformStartApiIntegrationBase, cls).setUpClass()
+
+    @staticmethod
+    def get_integ_dir():
+        return Path(__file__).resolve().parents[2]
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        super(TerraformStartApiIntegrationBase, cls).tearDownClass()
+        cls._remove_generated_directories()
+
+    @classmethod
+    def _remove_generated_directories(cls):
+        shutil.rmtree(str(Path(cls.project_directory / ".aws-sam-iacs")), ignore_errors=True)
+        shutil.rmtree(str(Path(cls.project_directory / ".terraform")), ignore_errors=True)
+        try:
+            os.remove(str(Path(cls.project_directory / ".terraform.lock.hcl")))
+        except (FileNotFoundError, PermissionError):
+            pass
+
+    @classmethod
+    def _run_command(cls, command, check) -> CompletedProcess:
+        test_data_folder = (
+            Path(cls.get_integ_dir()) / "testdata" / "start_api" / "terraform" / cls.terraform_application  # type: ignore
+        )
+        return run(command, cwd=test_data_folder, check=check, capture_output=True, timeout=cls.run_command_timeout)
+
+
+class TerraformStartApiIntegrationApplyBase(TerraformStartApiIntegrationBase):
+    terraform_application: str
+
+    @classmethod
+    def setUpClass(cls):
+        # init terraform project to populate deploy-only values
+        cls._run_command(["terraform", "init", "-input=false"], check=True)
+        cls._run_command(["terraform", "apply", "-auto-approve", "-input=false"], check=True)
+
+        super(TerraformStartApiIntegrationApplyBase, cls).setUpClass()
+
+    @staticmethod
+    def get_integ_dir():
+        return Path(__file__).resolve().parents[2]
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        try:
+            cls._run_command(["terraform", "apply", "-destroy", "-auto-approve", "-input=false"], check=True)
+        except CalledProcessError:
+            # skip, command can fail here if there isn't an applied project to destroy
+            # (eg. failed to apply in setup)
+            pass
+
+        try:
+            os.remove(str(Path(cls.project_directory / "terraform.tfstate")))  # type: ignore
+            os.remove(str(Path(cls.project_directory / "terraform.tfstate.backup")))  # type: ignore
+        except (FileNotFoundError, PermissionError):
+            pass
+
+        super(TerraformStartApiIntegrationApplyBase, cls).tearDownClass()
+
+
+@skipIf(
+    not CI_OVERRIDE,
+    "Skip Terraform test cases unless running in CI",
+)
+@pytest.mark.flaky(reruns=3)
+class TestStartApiTerraformApplication(TerraformStartApiIntegrationBase):
+    terraform_application = "terraform-v1-api-simple"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    def test_successful_request(self):
+        response = requests.get(self.url + "/hello", timeout=300)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {"message": "hello world"})
+
+
+@skipIf(
+    not CI_OVERRIDE,
+    "Skip Terraform test cases unless running in CI",
+)
+@pytest.mark.flaky(reruns=3)
+@parameterized_class(
+    [
+        {
+            "terraform_application": "lambda-auth-openapi",
+            "expected_error_message": "Error: AWS SAM CLI is unable to process a Terraform project that uses an OpenAPI"
+            " specification to define the API Gateway resource.",
+        },
+        {
+            "terraform_application": "terraform-api-simple-multiple-resources-limitation",
+            "expected_error_message": "Error: AWS SAM CLI could not process a Terraform project that contains a source "
+            "resource that is linked to more than one destination resource.",
+        },
+        {
+            "terraform_application": "terraform-api-simple-local-variables-limitation",
+            "expected_error_message": "Error: AWS SAM CLI could not process a Terraform project that uses local "
+            "variables to define linked resources.",
+        },
+    ]
+)
+class TestStartApiTerraformApplicationLimitations(TerraformStartApiIntegrationBase):
+    @classmethod
+    def setUpClass(cls):
+        command = get_sam_command()
+        cls.command_list = [
+            command,
+            "local",
+            "start-api",
+            "--hook-name",
+            "terraform",
+            "--beta-features",
+            "-p",
+            str(random_port()),
+        ]
+        cls.test_data_path = Path(cls.get_integ_dir()) / "testdata" / "start_api"
+        cls.project_directory = cls.test_data_path / "terraform" / cls.terraform_application
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        cls._remove_generated_directories()
+
+    def test_unsupported_limitations(self):
+        apply_disclaimer_message = "Unresolvable attributes discovered in project, run terraform apply to resolve them."
+
+        process = self._run_command(self.command_list, check=False)
+
+        LOG.info(process.stderr)
+        output = process.stderr.decode("utf-8")
+        self.assertEqual(process.returncode, 1)
+        self.assertRegex(output, self.expected_error_message)
+        self.assertRegex(output, apply_disclaimer_message)
+
+
+@skipIf(
+    not CI_OVERRIDE,
+    "Skip Terraform test cases unless running in CI",
+)
+@pytest.mark.flaky(reruns=3)
+@parameterized_class(
+    [
+        {
+            "terraform_application": "terraform-api-simple-multiple-resources-limitation",
+        },
+        {
+            "terraform_application": "terraform-api-simple-local-variables-limitation",
+        },
+    ]
+)
+class TestStartApiTerraformApplicationLimitationsAfterApply(TerraformStartApiIntegrationApplyBase):
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    def test_successful_request(self):
+        response = requests.get(self.url + "/hello", timeout=300)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {"message": "hello world"})
+
+
+@skipIf(
+    not CI_OVERRIDE,
+    "Skip Terraform test cases unless running in CI",
+)
+@pytest.mark.flaky(reruns=3)
+class TestStartApiTerraformApplicationV1LambdaAuthorizers(TerraformStartApiIntegrationBase):
+    terraform_application = "v1-lambda-authorizer"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    @parameterized.expand(
+        [
+            ("/hello", {"headers": {"myheader": "123"}}),
+            ("/hello-request", {"headers": {"myheader": "123"}, "params": {"mystring": "456"}}),
+            ("/hello-request-empty", {}),
+            ("/hello-request-empty", {"headers": {"foo": "bar"}}),
+        ]
+    )
+    def test_invoke_authorizer(self, endpoint, parameters):
+        response = requests.get(self.url + endpoint, timeout=300, **parameters)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {"message": "from authorizer"})
+
+    @parameterized.expand(
+        [
+            ("/hello", {"headers": {"blank": "invalid"}}),
+            ("/hello-request", {"headers": {"blank": "invalid"}, "params": {"blank": "invalid"}}),
+        ]
+    )
+    def test_missing_authorizer_identity_source(self, endpoint, parameters):
+        response = requests.get(self.url + endpoint, timeout=300, **parameters)
+
+        self.assertEqual(response.status_code, 401)
+
+    def test_fails_token_header_validation_authorizer(self):
+        response = requests.get(self.url + "/hello", timeout=300, headers={"myheader": "not valid"})
+
+        self.assertEqual(response.status_code, 401)
+
+
+@skipIf(
+    not CI_OVERRIDE,
+    "Skip Terraform test cases unless running in CI",
+)
+@pytest.mark.flaky(reruns=3)
+class TestStartApiTerraformApplicationOpenApiAuthorizer(TerraformStartApiIntegrationApplyBase):
+    terraform_application = "lambda-auth-openapi"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    @parameterized.expand(
+        [
+            ("/hello", {"headers": {"myheader": "123"}}),
+            ("/hello-request", {"headers": {"myheader": "123"}, "params": {"mystring": "456"}}),
+        ]
+    )
+    def test_successful_request(self, endpoint, params):
+        response = requests.get(self.url + endpoint, timeout=300, **params)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {"message": "from authorizer"})
+
+    @parameterized.expand(
+        [
+            ("/hello", {"headers": {"missin": "123"}}),
+            ("/hello-request", {"headers": {"notcorrect": "123"}, "params": {"abcde": "456"}}),
+        ]
+    )
+    def test_missing_identity_sources(self, endpoint, params):
+        response = requests.get(self.url + endpoint, timeout=300, **params)
+
+        self.assertEqual(response.status_code, 401)
diff --git a/tests/integration/testdata/start_api/terraform/lambda-auth-openapi/lambda-functions.zip b/tests/integration/testdata/start_api/terraform/lambda-auth-openapi/lambda-functions.zip
new file mode 100644
index 0000000000000000000000000000000000000000..36c26446344af50d1215621f24af2bff75856930
GIT binary patch
literal 551
zcmWIWW@Zs#-~d9t+CyOsP@u%jz`)I*z>txcmy(lORIFD}85+XNz<xKsDuuhCDg{KB
zR&X;gvix9VU;rAxz)%}>((kZ=$e!ogI`e0(%A72s5%DNMly7eVLnpV>iPE@R4oU3#
zu^K<iH(i{iw`cO-X*12gsYL26aeMDoaJ*B&?aGUzx0^m`u-<G`Ex7CKQ^1@3R)~G7
zqNDW5i`({vG#1Y+nD)eEuG<WS9FY_GQfHjZdh`m;zY@+oWLDlZbIlRm=<gDxe<hcA
zv8*?6vgg=);Cs_V)&O(c%vB5L*8dD%l~g@tW&1Io?FTlnrI}Qi_@9`ff0SKD;7!`Q
z#}W}on~rB{g+0F|=g6rnIVUFlx~r;s$<hwr{3+}qnfeNj7JGK=k&3-PW!2i#4;%|5
zO4ws-gnoS0h_+b%y7epP+w`QO4?iR|T%S+nk@22*)lI<YC)3XK{14s7G`ThAKdoQA
zWyTA!t55&Ql(2jMFj??r$=${6+gfjj=y+-W-aX^>oQ?CfWD~ErxLp0T@O^Yry3(yF
zCr{n`dm?4$t2v=}=Y5O1>-L5}z?+?eUHjgqcwl&gVkf|xkx7IZ5p&3LpqPV!C5<2!
X3Go=<&B_MS!U%+sKzawzLIwr^eU{QQ

literal 0
HcmV?d00001

diff --git a/tests/integration/testdata/start_api/terraform/lambda-auth-openapi/main.tf b/tests/integration/testdata/start_api/terraform/lambda-auth-openapi/main.tf
new file mode 100644
index 0000000000..8005fb4e95
--- /dev/null
+++ b/tests/integration/testdata/start_api/terraform/lambda-auth-openapi/main.tf
@@ -0,0 +1,112 @@
+provider "aws" {}
+
+data "aws_region" "current" {}
+
+resource "aws_api_gateway_authorizer" "header_authorizer" {
+  name = "header-authorizer-open-api"
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  authorizer_uri = aws_lambda_function.authorizer.invoke_arn
+  authorizer_credentials = aws_iam_role.invocation_role.arn
+  identity_source = "method.request.header.myheader"
+  identity_validation_expression = "^123$"
+}
+
+resource "aws_lambda_function" "authorizer" {
+  filename = "lambda-functions.zip"
+  function_name = "authorizer-open-api"
+  role = aws_iam_role.invocation_role.arn
+  handler = "handlers.auth_handler"
+  runtime = "python3.8"
+  source_code_hash = filebase64sha256("lambda-functions.zip")
+}
+
+resource "aws_lambda_function" "hello_endpoint" {
+  filename = "lambda-functions.zip"
+  function_name = "hello-lambda-open-api"
+  role = aws_iam_role.invocation_role.arn
+  handler = "handlers.hello_handler"
+  runtime = "python3.8"
+  source_code_hash = filebase64sha256("lambda-functions.zip")
+}
+
+resource "aws_api_gateway_rest_api" "api" {
+  name = "api-open-api"
+  body = jsonencode({
+    swagger = "2.0"
+    info = {
+      title = "api-body"
+      version = "1.0"
+    }
+    securityDefinitions = {
+      TokenAuthorizer = {
+        type = "apiKey"
+        in = "header"
+        name = "myheader"
+        x-amazon-apigateway-authtype = "custom"
+        x-amazon-apigateway-authorizer = {
+          type = "TOKEN"
+          authorizerUri = "arn:aws:apigateway:${data.aws_region.current.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.authorizer.arn}/invocations"
+        }
+      }
+      RequestAuthorizer = {
+        type = "apiKey"
+        in = "unused"
+        name = "unused"
+        x-amazon-apigateway-authtype = "custom"
+        x-amazon-apigateway-authorizer = {
+          type = "REQUEST"
+          identitySource = "method.request.header.myheader, method.request.querystring.mystring"
+          authorizerUri = "arn:aws:apigateway:${data.aws_region.current.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.authorizer.arn}/invocations"
+        }
+      }
+    }
+    paths = {
+      "/hello" = {
+        get = {
+          security = [
+            {TokenAuthorizer = []}
+          ]
+          x-amazon-apigateway-integration = {
+            httpMethod = "GET"
+            payloadFormatVersion = "1.0"
+            type = "AWS_PROXY"
+            uri = "arn:aws:apigateway:${data.aws_region.current.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.hello_endpoint.arn}/invocations"
+          }
+        }
+      }
+      "/hello-request" = {
+        get = {
+          security = [
+            {RequestAuthorizer = []}
+          ]
+          x-amazon-apigateway-integration = {
+            httpMethod = "GET"
+            payloadFormatVersion = "1.0"
+            type = "AWS_PROXY"
+            uri = "arn:aws:apigateway:${data.aws_region.current.name}:lambda:path/2015-03-31/functions/${aws_lambda_function.hello_endpoint.arn}/invocations"
+          }
+        }
+      }
+    }
+  })
+}
+
+resource "aws_iam_role" "invocation_role" {
+  name = "iam-lambda-open-api"
+  path = "/"
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "lambda.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
diff --git a/tests/integration/testdata/start_api/terraform/terraform-api-simple-local-variables-limitation/HelloWorldFunction.zip b/tests/integration/testdata/start_api/terraform/terraform-api-simple-local-variables-limitation/HelloWorldFunction.zip
new file mode 100644
index 0000000000000000000000000000000000000000..4daa6de02dd8d472c93e7be277639d6220ea20b3
GIT binary patch
literal 1079
zcmWIWW@Zs#-~hsiz!xD5NPwF`fgwIVGcU6wK3=b&GBkvjfn6f?L=p)9PQR8^TEWf0
z$nt}cfdOa$0|PTdfHyk_NIw(QkN~Vk*RwD%umO!uEGQtt)V;w6yKWl@?ES6H_H>d%
zj=rr_mB#73$cT&^d&Rnvd~@F3nr0<s>UsKKwd(1On*(k|vmU$l<Lu??{G7Yd&OG|(
zcp|qk&E3{=-`1)ua+;=%gZl5ilkP`ZuHeh;wJ&&}dnGNw=Hs$c3Ob5MHowVjPq0<A
z>C-Lv;C$Aq$o-7pq&E{M-q~^XxoMvJEv_l+m@7jTa9;hPw$6Vy`wtz-{!cZE_a|D;
zeVDjm-otwV`j)dFmQUoFvQj%^=GxV#jB;WW`yak~>TfKv^`&=a>12=7dUs@}Yn^z}
z<C?W6EW+x^o!d656K+=|t!sYYmh$Ck*R<bxq8Xn$)yu7x894H{>Fu?8)zcdJTqJ=t
z?SE6fiLK;bUk3&I4etb<+SUg09kOvSntbo~f?C7+ga0qrO)`tl_p0VQ<7}sSdh&*g
z$w~E2-%Miq^?$!E*jEv^Y;xM}6Fw>bvpuG-H<`PiX<4zU?Xji0HFNg=UgQ|py+YGt
zRrH$pt#d_Oa|5T`@Htzt>Z0C$pN~`I-W@BlkX^#O$1aogyad~GpBYa?Oit|OG%Q@r
zJne+QhMg=wGo;F|=4x6*KUUklYT^|>#^BDNRr{aKXiYwO@2*tqq9%TG^V?6a-dj<u
zaqRy7fPLHZ_I~MYkefT%H%CObY;NP?g?^oHt*>yoq`xwJ&A=1r>d(6HZAx$U$5MgY
z6aJ*VtGvDB-}X1=;G`9O{2n_nZGjRH_M`<$cLKnqRg_v-npu>Zo0?ZrtXEP|LQc|U
zWD;RU%@?p_4ayfVu%r>hA|aOqc%vDN<S9_DfPp2A(Lg3~c?82upiY=$LBRn7OB%NU
Zg-H#Z0B=?{kO|B{$j!*WAjS;h0RRw%Zs`C3

literal 0
HcmV?d00001

diff --git a/tests/integration/testdata/start_api/terraform/terraform-api-simple-local-variables-limitation/main.tf b/tests/integration/testdata/start_api/terraform/terraform-api-simple-local-variables-limitation/main.tf
new file mode 100644
index 0000000000..2f4d694f3d
--- /dev/null
+++ b/tests/integration/testdata/start_api/terraform/terraform-api-simple-local-variables-limitation/main.tf
@@ -0,0 +1,136 @@
+provider "aws" {
+}
+
+locals {
+    api_function = aws_lambda_function.HelloWorldFunction.invoke_arn
+}
+
+resource "random_uuid" "unique_id" {
+    keepers = {
+        my_key = "my_key"
+    }
+}
+
+resource "aws_iam_role" "iam_for_lambda" {
+  name = "iam_for_lambda_${random_uuid.unique_id.result}"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "lambda.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_s3_bucket" "lambda_code_bucket" {
+  bucket = "lambda-code-bucket-${random_uuid.unique_id.result}"
+}
+
+resource "aws_s3_object" "s3_lambda_code" {
+  bucket = "lambda-code-bucket-${random_uuid.unique_id.result}"
+  key    = "s3_lambda_code_key"
+  source = "HelloWorldFunction.zip"
+  depends_on = [aws_s3_bucket.lambda_code_bucket]
+}
+
+resource "aws_lambda_layer_version" "MyAwesomeLayer" {
+  filename            = "HelloWorldFunction.zip"
+  layer_name          = "MyAwesomeLayer"
+  compatible_runtimes = ["python3.8"]
+}
+
+resource "aws_lambda_function" "HelloWorldFunction" {
+  s3_bucket     = "lambda-code-bucket-${random_uuid.unique_id.result}"
+  s3_key        = "s3_lambda_code_key"
+  handler       = "app.lambda_handler"
+  runtime       = "python3.8"
+  function_name = "HelloWorldFunction-${random_uuid.unique_id.result}"
+  timeout       = 500
+  role          = aws_iam_role.iam_for_lambda.arn
+  layers        = [aws_lambda_layer_version.MyAwesomeLayer.arn]
+  depends_on = [aws_s3_object.s3_lambda_code]
+}
+
+resource "aws_lambda_function" "HelloWorldFunction2" {
+  s3_bucket     = "lambda-code-bucket-${random_uuid.unique_id.result}"
+  s3_key        = "s3_lambda_code_key"
+  handler       = "app.lambda_handler"
+  runtime       = "python3.8"
+  function_name = "HelloWorldFunction2-${random_uuid.unique_id.result}"
+  timeout       = 500
+  role          = aws_iam_role.iam_for_lambda.arn
+  depends_on = [aws_s3_object.s3_lambda_code]
+}
+
+resource "aws_api_gateway_rest_api" "MyDemoAPI" {
+  name               = "MyDemoAPI"
+  binary_media_types = [ "utf-8" ]
+}
+
+resource "aws_api_gateway_resource" "MyDemoResource" {
+  rest_api_id = aws_api_gateway_rest_api.MyDemoAPI.id
+  parent_id   = aws_api_gateway_rest_api.MyDemoAPI.root_resource_id
+  path_part   = "hello"
+}
+
+resource "aws_api_gateway_method" "GetMethod" {
+  rest_api_id    = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id    = aws_api_gateway_resource.MyDemoResource.id
+  http_method    = "GET"
+  authorization  = "NONE"
+}
+
+resource "aws_api_gateway_method" "PostMethod" {
+  rest_api_id    = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id    = aws_api_gateway_resource.MyDemoResource.id
+  http_method    = "POST"
+  authorization  = "NONE"
+}
+
+resource "aws_api_gateway_stage" "MyDemoStage" {
+  stage_name    = "prod-${random_uuid.unique_id.result}"
+  rest_api_id   = aws_api_gateway_rest_api.MyDemoAPI.id
+  deployment_id = aws_api_gateway_deployment.MyDemoDeployment.id
+}
+
+resource "aws_api_gateway_deployment" "MyDemoDeployment" {
+  rest_api_id = aws_api_gateway_rest_api.MyDemoAPI.id
+  triggers = {
+    redeployment = sha1(jsonencode([
+      aws_api_gateway_resource.MyDemoResource.id,
+      aws_api_gateway_method.GetMethod.http_method,
+      aws_api_gateway_integration.MyDemoIntegration.id,
+    ]))
+  }
+
+  lifecycle {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegration" {
+  rest_api_id      = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id      = aws_api_gateway_resource.MyDemoResource.id
+  http_method      = aws_api_gateway_method.GetMethod.http_method
+  integration_http_method = "POST"
+  type             = "AWS_PROXY"
+  content_handling = "CONVERT_TO_TEXT"
+  uri              = local.api_function
+  depends_on = [aws_api_gateway_method.GetMethod]
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegrationMock" {
+  rest_api_id      = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id      = aws_api_gateway_resource.MyDemoResource.id
+  http_method      = aws_api_gateway_method.PostMethod.http_method
+  type             = "MOCK"
+}
diff --git a/tests/integration/testdata/start_api/terraform/terraform-api-simple-multiple-resources-limitation/HelloWorldFunction.zip b/tests/integration/testdata/start_api/terraform/terraform-api-simple-multiple-resources-limitation/HelloWorldFunction.zip
new file mode 100644
index 0000000000000000000000000000000000000000..4daa6de02dd8d472c93e7be277639d6220ea20b3
GIT binary patch
literal 1079
zcmWIWW@Zs#-~hsiz!xD5NPwF`fgwIVGcU6wK3=b&GBkvjfn6f?L=p)9PQR8^TEWf0
z$nt}cfdOa$0|PTdfHyk_NIw(QkN~Vk*RwD%umO!uEGQtt)V;w6yKWl@?ES6H_H>d%
zj=rr_mB#73$cT&^d&Rnvd~@F3nr0<s>UsKKwd(1On*(k|vmU$l<Lu??{G7Yd&OG|(
zcp|qk&E3{=-`1)ua+;=%gZl5ilkP`ZuHeh;wJ&&}dnGNw=Hs$c3Ob5MHowVjPq0<A
z>C-Lv;C$Aq$o-7pq&E{M-q~^XxoMvJEv_l+m@7jTa9;hPw$6Vy`wtz-{!cZE_a|D;
zeVDjm-otwV`j)dFmQUoFvQj%^=GxV#jB;WW`yak~>TfKv^`&=a>12=7dUs@}Yn^z}
z<C?W6EW+x^o!d656K+=|t!sYYmh$Ck*R<bxq8Xn$)yu7x894H{>Fu?8)zcdJTqJ=t
z?SE6fiLK;bUk3&I4etb<+SUg09kOvSntbo~f?C7+ga0qrO)`tl_p0VQ<7}sSdh&*g
z$w~E2-%Miq^?$!E*jEv^Y;xM}6Fw>bvpuG-H<`PiX<4zU?Xji0HFNg=UgQ|py+YGt
zRrH$pt#d_Oa|5T`@Htzt>Z0C$pN~`I-W@BlkX^#O$1aogyad~GpBYa?Oit|OG%Q@r
zJne+QhMg=wGo;F|=4x6*KUUklYT^|>#^BDNRr{aKXiYwO@2*tqq9%TG^V?6a-dj<u
zaqRy7fPLHZ_I~MYkefT%H%CObY;NP?g?^oHt*>yoq`xwJ&A=1r>d(6HZAx$U$5MgY
z6aJ*VtGvDB-}X1=;G`9O{2n_nZGjRH_M`<$cLKnqRg_v-npu>Zo0?ZrtXEP|LQc|U
zWD;RU%@?p_4ayfVu%r>hA|aOqc%vDN<S9_DfPp2A(Lg3~c?82upiY=$LBRn7OB%NU
Zg-H#Z0B=?{kO|B{$j!*WAjS;h0RRw%Zs`C3

literal 0
HcmV?d00001

diff --git a/tests/integration/testdata/start_api/terraform/terraform-api-simple-multiple-resources-limitation/main.tf b/tests/integration/testdata/start_api/terraform/terraform-api-simple-multiple-resources-limitation/main.tf
new file mode 100644
index 0000000000..7a633c454b
--- /dev/null
+++ b/tests/integration/testdata/start_api/terraform/terraform-api-simple-multiple-resources-limitation/main.tf
@@ -0,0 +1,138 @@
+provider "aws" {
+}
+
+variable "stage" {
+    type = string
+    description = "stage"
+    default = "beta"
+}
+
+resource "random_uuid" "unique_id" {
+    keepers = {
+        my_key = "my_key"
+    }
+}
+
+resource "aws_iam_role" "iam_for_lambda" {
+  name = "iam_for_lambda_${random_uuid.unique_id.result}"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "lambda.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_s3_bucket" "lambda_code_bucket" {
+  bucket = "lambda-code-bucket-${random_uuid.unique_id.result}"
+}
+
+resource "aws_s3_object" "s3_lambda_code" {
+  bucket = "lambda-code-bucket-${random_uuid.unique_id.result}"
+  key    = "s3_lambda_code_key"
+  source = "HelloWorldFunction.zip"
+  depends_on = [aws_s3_bucket.lambda_code_bucket]
+}
+
+resource "aws_lambda_layer_version" "MyAwesomeLayer" {
+  filename            = "HelloWorldFunction.zip"
+  layer_name          = "MyAwesomeLayer"
+  compatible_runtimes = ["python3.8"]
+}
+
+resource "aws_lambda_function" "HelloWorldFunction" {
+  s3_bucket     = "lambda-code-bucket-${random_uuid.unique_id.result}"
+  s3_key        = "s3_lambda_code_key"
+  handler       = "app.lambda_handler"
+  runtime       = "python3.8"
+  function_name = "HelloWorldFunction-${random_uuid.unique_id.result}"
+  timeout       = 500
+  role          = aws_iam_role.iam_for_lambda.arn
+  layers        = [aws_lambda_layer_version.MyAwesomeLayer.arn]
+  depends_on = [aws_s3_object.s3_lambda_code]
+}
+
+resource "aws_lambda_function" "HelloWorldFunction2" {
+  s3_bucket     = "lambda-code-bucket-${random_uuid.unique_id.result}"
+  s3_key        = "s3_lambda_code_key"
+  handler       = "app.lambda_handler"
+  runtime       = "python3.8"
+  function_name = "HelloWorldFunction2-${random_uuid.unique_id.result}"
+  timeout       = 500
+  role          = aws_iam_role.iam_for_lambda.arn
+  depends_on = [aws_s3_object.s3_lambda_code]
+}
+
+resource "aws_api_gateway_rest_api" "MyDemoAPI" {
+  name               = "MyDemoAPI"
+  binary_media_types = [ "utf-8" ]
+}
+
+resource "aws_api_gateway_resource" "MyDemoResource" {
+  rest_api_id = aws_api_gateway_rest_api.MyDemoAPI.id
+  parent_id   = aws_api_gateway_rest_api.MyDemoAPI.root_resource_id
+  path_part   = "hello"
+}
+
+resource "aws_api_gateway_method" "GetMethod" {
+  rest_api_id    = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id    = aws_api_gateway_resource.MyDemoResource.id
+  http_method    = "GET"
+  authorization  = "NONE"
+}
+
+resource "aws_api_gateway_method" "PostMethod" {
+  rest_api_id    = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id    = aws_api_gateway_resource.MyDemoResource.id
+  http_method    = "POST"
+  authorization  = "NONE"
+}
+
+resource "aws_api_gateway_stage" "MyDemoStage" {
+  stage_name    = "prod-${random_uuid.unique_id.result}"
+  rest_api_id   = aws_api_gateway_rest_api.MyDemoAPI.id
+  deployment_id = aws_api_gateway_deployment.MyDemoDeployment.id
+}
+
+resource "aws_api_gateway_deployment" "MyDemoDeployment" {
+  rest_api_id = aws_api_gateway_rest_api.MyDemoAPI.id
+  triggers = {
+    redeployment = sha1(jsonencode([
+      aws_api_gateway_resource.MyDemoResource.id,
+      aws_api_gateway_method.GetMethod.http_method,
+      aws_api_gateway_integration.MyDemoIntegration.id,
+    ]))
+  }
+
+  lifecycle {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegration" {
+  rest_api_id      = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id      = aws_api_gateway_resource.MyDemoResource.id
+  http_method      = aws_api_gateway_method.GetMethod.http_method
+  integration_http_method = "POST"
+  type             = "AWS_PROXY"
+  content_handling = "CONVERT_TO_TEXT"
+  uri              = var.stage == "beta" ? aws_lambda_function.HelloWorldFunction.invoke_arn : aws_lambda_function.HelloWorldFunction2.invoke_arn
+  depends_on = [aws_api_gateway_method.GetMethod]
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegrationMock" {
+  rest_api_id      = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id      = aws_api_gateway_resource.MyDemoResource.id
+  http_method      = aws_api_gateway_method.PostMethod.http_method
+  type             = "MOCK"
+}
diff --git a/tests/integration/testdata/start_api/terraform/terraform-v1-api-simple/HelloWorldFunction.zip b/tests/integration/testdata/start_api/terraform/terraform-v1-api-simple/HelloWorldFunction.zip
new file mode 100644
index 0000000000000000000000000000000000000000..4daa6de02dd8d472c93e7be277639d6220ea20b3
GIT binary patch
literal 1079
zcmWIWW@Zs#-~hsiz!xD5NPwF`fgwIVGcU6wK3=b&GBkvjfn6f?L=p)9PQR8^TEWf0
z$nt}cfdOa$0|PTdfHyk_NIw(QkN~Vk*RwD%umO!uEGQtt)V;w6yKWl@?ES6H_H>d%
zj=rr_mB#73$cT&^d&Rnvd~@F3nr0<s>UsKKwd(1On*(k|vmU$l<Lu??{G7Yd&OG|(
zcp|qk&E3{=-`1)ua+;=%gZl5ilkP`ZuHeh;wJ&&}dnGNw=Hs$c3Ob5MHowVjPq0<A
z>C-Lv;C$Aq$o-7pq&E{M-q~^XxoMvJEv_l+m@7jTa9;hPw$6Vy`wtz-{!cZE_a|D;
zeVDjm-otwV`j)dFmQUoFvQj%^=GxV#jB;WW`yak~>TfKv^`&=a>12=7dUs@}Yn^z}
z<C?W6EW+x^o!d656K+=|t!sYYmh$Ck*R<bxq8Xn$)yu7x894H{>Fu?8)zcdJTqJ=t
z?SE6fiLK;bUk3&I4etb<+SUg09kOvSntbo~f?C7+ga0qrO)`tl_p0VQ<7}sSdh&*g
z$w~E2-%Miq^?$!E*jEv^Y;xM}6Fw>bvpuG-H<`PiX<4zU?Xji0HFNg=UgQ|py+YGt
zRrH$pt#d_Oa|5T`@Htzt>Z0C$pN~`I-W@BlkX^#O$1aogyad~GpBYa?Oit|OG%Q@r
zJne+QhMg=wGo;F|=4x6*KUUklYT^|>#^BDNRr{aKXiYwO@2*tqq9%TG^V?6a-dj<u
zaqRy7fPLHZ_I~MYkefT%H%CObY;NP?g?^oHt*>yoq`xwJ&A=1r>d(6HZAx$U$5MgY
z6aJ*VtGvDB-}X1=;G`9O{2n_nZGjRH_M`<$cLKnqRg_v-npu>Zo0?ZrtXEP|LQc|U
zWD;RU%@?p_4ayfVu%r>hA|aOqc%vDN<S9_DfPp2A(Lg3~c?82upiY=$LBRn7OB%NU
Zg-H#Z0B=?{kO|B{$j!*WAjS;h0RRw%Zs`C3

literal 0
HcmV?d00001

diff --git a/tests/integration/testdata/start_api/terraform/terraform-v1-api-simple/main.tf b/tests/integration/testdata/start_api/terraform/terraform-v1-api-simple/main.tf
new file mode 100644
index 0000000000..7f64aca6ad
--- /dev/null
+++ b/tests/integration/testdata/start_api/terraform/terraform-v1-api-simple/main.tf
@@ -0,0 +1,112 @@
+provider "aws" {
+}
+
+resource "aws_iam_role" "iam_for_lambda" {
+  name = "iam_for_lambda"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "lambda.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_s3_bucket" "lambda_code_bucket" {
+  bucket = "lambda_code_bucket"
+}
+
+resource "aws_s3_object" "s3_lambda_code" {
+  bucket = "lambda_code_bucket"
+  key    = "s3_lambda_code_key"
+  source = "HelloWorldFunction.zip"
+}
+
+resource "aws_lambda_layer_version" "MyAwesomeLayer" {
+  filename            = "HelloWorldFunction.zip"
+  layer_name          = "MyAwesomeLayer"
+  compatible_runtimes = ["python3.8"]
+}
+
+resource "aws_lambda_function" "HelloWorldFunction" {
+  s3_bucket     = "lambda_code_bucket"
+  s3_key        = "s3_lambda_code_key"
+  handler       = "app.lambda_handler"
+  runtime       = "python3.8"
+  function_name = "HelloWorldFunction"
+  timeout       = 500
+  role          = aws_iam_role.iam_for_lambda.arn
+  layers        = [aws_lambda_layer_version.MyAwesomeLayer.arn]
+}
+
+resource "aws_lambda_function" "HelloWorldFunction2" {
+  s3_bucket     = "lambda_code_bucket"
+  s3_key        = "s3_lambda_code_key"
+  handler       = "app.lambda_handler"
+  runtime       = "python3.8"
+  function_name = "HelloWorldFunction2"
+  timeout       = 500
+  role          = aws_iam_role.iam_for_lambda.arn
+  layers        = ["arn:aws:lambda:us-east-1:178733185316:layer:01383708b0:1"]
+}
+
+resource "aws_api_gateway_rest_api" "MyDemoAPI" {
+  name               = "MyDemoAPI"
+  binary_media_types = [ "utf-8" ]
+}
+
+resource "aws_api_gateway_resource" "MyDemoResource" {
+  rest_api_id = aws_api_gateway_rest_api.MyDemoAPI.id
+  parent_id   = aws_api_gateway_rest_api.MyDemoAPI.root_resource_id
+  path_part   = "hello"
+}
+
+resource "aws_api_gateway_method" "GetMethod" {
+  rest_api_id    = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id    = aws_api_gateway_resource.MyDemoResource.id
+  http_method    = "GET"
+  authorization  = "NONE"
+}
+
+resource "aws_api_gateway_method" "PostMethod" {
+  rest_api_id    = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id    = aws_api_gateway_resource.MyDemoResource.id
+  http_method    = "POST"
+  authorization  = "NONE"
+}
+
+resource "aws_api_gateway_stage" "MyDemoStage" {
+  stage_name    = "prod"
+  rest_api_id   = aws_api_gateway_rest_api.MyDemoAPI.id
+  deployment_id = aws_api_gateway_deployment.MyDemoDeployment.id
+}
+
+resource "aws_api_gateway_deployment" "MyDemoDeployment" {
+  rest_api_id = aws_api_gateway_rest_api.MyDemoAPI.id
+  stage_name  = "prod"
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegration" {
+  rest_api_id      = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id      = aws_api_gateway_resource.MyDemoResource.id
+  http_method      = aws_api_gateway_method.GetMethod.http_method
+  type             = "AWS_PROXY"
+  content_handling = "CONVERT_TO_TEXT"
+  uri              = aws_lambda_function.HelloWorldFunction.invoke_arn
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegrationMock" {
+  rest_api_id      = aws_api_gateway_rest_api.MyDemoAPI.id
+  resource_id      = aws_api_gateway_resource.MyDemoResource.id
+  http_method      = aws_api_gateway_method.PostMethod.http_method
+  type             = "MOCK"
+}
diff --git a/tests/integration/testdata/start_api/terraform/v1-lambda-authorizer/lambda-functions.zip b/tests/integration/testdata/start_api/terraform/v1-lambda-authorizer/lambda-functions.zip
new file mode 100644
index 0000000000000000000000000000000000000000..36c26446344af50d1215621f24af2bff75856930
GIT binary patch
literal 551
zcmWIWW@Zs#-~d9t+CyOsP@u%jz`)I*z>txcmy(lORIFD}85+XNz<xKsDuuhCDg{KB
zR&X;gvix9VU;rAxz)%}>((kZ=$e!ogI`e0(%A72s5%DNMly7eVLnpV>iPE@R4oU3#
zu^K<iH(i{iw`cO-X*12gsYL26aeMDoaJ*B&?aGUzx0^m`u-<G`Ex7CKQ^1@3R)~G7
zqNDW5i`({vG#1Y+nD)eEuG<WS9FY_GQfHjZdh`m;zY@+oWLDlZbIlRm=<gDxe<hcA
zv8*?6vgg=);Cs_V)&O(c%vB5L*8dD%l~g@tW&1Io?FTlnrI}Qi_@9`ff0SKD;7!`Q
z#}W}on~rB{g+0F|=g6rnIVUFlx~r;s$<hwr{3+}qnfeNj7JGK=k&3-PW!2i#4;%|5
zO4ws-gnoS0h_+b%y7epP+w`QO4?iR|T%S+nk@22*)lI<YC)3XK{14s7G`ThAKdoQA
zWyTA!t55&Ql(2jMFj??r$=${6+gfjj=y+-W-aX^>oQ?CfWD~ErxLp0T@O^Yry3(yF
zCr{n`dm?4$t2v=}=Y5O1>-L5}z?+?eUHjgqcwl&gVkf|xkx7IZ5p&3LpqPV!C5<2!
X3Go=<&B_MS!U%+sKzawzLIwr^eU{QQ

literal 0
HcmV?d00001

diff --git a/tests/integration/testdata/start_api/terraform/v1-lambda-authorizer/main.tf b/tests/integration/testdata/start_api/terraform/v1-lambda-authorizer/main.tf
new file mode 100644
index 0000000000..b3dcc7b51c
--- /dev/null
+++ b/tests/integration/testdata/start_api/terraform/v1-lambda-authorizer/main.tf
@@ -0,0 +1,139 @@
+provider "aws" {}
+
+resource "aws_api_gateway_authorizer" "header_authorizer" {
+  name = "header_authorizer"
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  authorizer_uri = aws_lambda_function.authorizer.invoke_arn
+  authorizer_credentials = aws_iam_role.invocation_role.arn
+  identity_source = "method.request.header.myheader"
+  identity_validation_expression = "^123$"
+}
+
+resource "aws_api_gateway_authorizer" "request_authorizer" {
+  name = "request_authorizer"
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  authorizer_uri = aws_lambda_function.authorizer.invoke_arn
+  authorizer_credentials = aws_iam_role.invocation_role.arn
+  identity_source = "method.request.header.myheader, method.request.querystring.mystring"
+  type = "REQUEST"
+}
+
+resource "aws_api_gateway_authorizer" "request_authorizer_empty" {
+  name = "request_authorizer"
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  authorizer_uri = aws_lambda_function.authorizer.invoke_arn
+  authorizer_credentials = aws_iam_role.invocation_role.arn
+  identity_source = ""
+  type = "REQUEST"
+}
+
+resource "aws_lambda_function" "authorizer" {
+  filename = "lambda-functions.zip"
+  function_name = "authorizer"
+  role = aws_iam_role.invocation_role.arn
+  handler = "handlers.auth_handler"
+  runtime = "python3.8"
+  source_code_hash = filebase64sha256("lambda-functions.zip")
+}
+
+resource "aws_lambda_function" "hello_endpoint" {
+  filename = "lambda-functions.zip"
+  function_name = "hello_lambda"
+  role = aws_iam_role.invocation_role.arn
+  handler = "handlers.hello_handler"
+  runtime = "python3.8"
+  source_code_hash = filebase64sha256("lambda-functions.zip")
+}
+
+resource "aws_api_gateway_method" "get_hello" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  resource_id = aws_api_gateway_resource.hello_resource.id
+  http_method = "GET"
+  authorizer_id = aws_api_gateway_authorizer.header_authorizer.id
+  authorization = "CUSTOM"
+}
+
+resource "aws_api_gateway_method" "get_hello_request" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  resource_id = aws_api_gateway_resource.hello_resource_request.id
+  http_method = "GET"
+  authorizer_id = aws_api_gateway_authorizer.request_authorizer.id
+  authorization = "CUSTOM"
+}
+
+resource "aws_api_gateway_method" "get_hello_request_empty" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  resource_id = aws_api_gateway_resource.hello_resource_request_empty.id
+  http_method = "GET"
+  authorizer_id = aws_api_gateway_authorizer.request_authorizer_empty.id
+  authorization = "CUSTOM"
+}
+
+resource "aws_api_gateway_resource" "hello_resource" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  parent_id = aws_api_gateway_rest_api.api.root_resource_id
+  path_part = "hello"
+}
+
+resource "aws_api_gateway_resource" "hello_resource_request" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  parent_id = aws_api_gateway_rest_api.api.root_resource_id
+  path_part = "hello-request"
+}
+
+resource "aws_api_gateway_resource" "hello_resource_request_empty" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  parent_id = aws_api_gateway_rest_api.api.root_resource_id
+  path_part = "hello-request-empty"
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegration" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  resource_id = aws_api_gateway_resource.hello_resource.id
+  http_method = aws_api_gateway_method.get_hello.http_method
+  type = "AWS_PROXY"
+  content_handling = "CONVERT_TO_TEXT"
+  uri = aws_lambda_function.hello_endpoint.invoke_arn
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegrationRequest" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  resource_id = aws_api_gateway_resource.hello_resource_request.id
+  http_method = aws_api_gateway_method.get_hello_request.http_method
+  type = "AWS_PROXY"
+  content_handling = "CONVERT_TO_TEXT"
+  uri = aws_lambda_function.hello_endpoint.invoke_arn
+}
+
+resource "aws_api_gateway_integration" "MyDemoIntegrationRequestEmpty" {
+  rest_api_id = aws_api_gateway_rest_api.api.id
+  resource_id = aws_api_gateway_resource.hello_resource_request_empty.id
+  http_method = aws_api_gateway_method.get_hello_request_empty.http_method
+  type = "AWS_PROXY"
+  content_handling = "CONVERT_TO_TEXT"
+  uri = aws_lambda_function.hello_endpoint.invoke_arn
+}
+
+resource "aws_api_gateway_rest_api" "api" {
+  name = "api"
+}
+
+resource "aws_iam_role" "invocation_role" {
+  name = "iam_lambda"
+  path = "/"
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "lambda.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
\ No newline at end of file
diff --git a/tests/unit/commands/local/start_api/core/test_command.py b/tests/unit/commands/local/start_api/core/test_command.py
index 30c07ae5d4..67eab70400 100644
--- a/tests/unit/commands/local/start_api/core/test_command.py
+++ b/tests/unit/commands/local/start_api/core/test_command.py
@@ -28,6 +28,7 @@ def test_get_options_local_start_api_command(self, mock_get_params):
             MockParams(rv=("--parameter-overrides", ""), name="parameter_overrides"),
             MockParams(rv=("--host", ""), name="host"),
             MockParams(rv=("--config-file", ""), name="config_file"),
+            MockParams(rv=("--hook_name", ""), name="hook_name"),
             MockParams(rv=("--beta-features", ""), name="beta_features"),
             MockParams(rv=("--log-file", ""), name="log_file"),
             MockParams(rv=("--debug", ""), name="debug"),
@@ -41,6 +42,7 @@ def test_get_options_local_start_api_command(self, mock_get_params):
             "Container Options": [("", ""), ("--host", ""), ("", "")],
             "Description": [(cmd.description + cmd.description_addendum, "")],
             "Examples": [("", ""), ("$sam local start-api\x1b[0m", "")],
+            "Extension Options": [("", ""), ("--hook_name", ""), ("", "")],
             "Other Options": [("", ""), ("--debug", ""), ("", "")],
             "Beta Options": [("", ""), ("--beta-features", ""), ("", "")],
             "Required Options": [("", ""), ("--template-file", ""), ("", "")],
diff --git a/tests/unit/commands/local/start_api/test_cli.py b/tests/unit/commands/local/start_api/test_cli.py
index 4f96394742..f8aae412c7 100644
--- a/tests/unit/commands/local/start_api/test_cli.py
+++ b/tests/unit/commands/local/start_api/test_cli.py
@@ -39,6 +39,8 @@ def setUp(self):
         self.warm_containers = None
         self.debug_function = None
 
+        self.hook_name = None
+
         self.ctx_mock = Mock()
         self.ctx_mock.region = self.region_name
         self.ctx_mock.profile = self.profile
@@ -196,4 +198,5 @@ def call_cli(self):
             container_host=self.container_host,
             container_host_interface=self.container_host_interface,
             invoke_image=self.invoke_image,
+            hook_name=self.hook_name,
         )
diff --git a/tests/unit/commands/samconfig/test_samconfig.py b/tests/unit/commands/samconfig/test_samconfig.py
index 1ff1217138..19b4a7672d 100644
--- a/tests/unit/commands/samconfig/test_samconfig.py
+++ b/tests/unit/commands/samconfig/test_samconfig.py
@@ -457,6 +457,7 @@ def test_local_start_api(self, do_cli_mock):
                 "localhost",
                 "127.0.0.1",
                 ("image",),
+                None,
             )
 
     @patch("samcli.commands.local.start_lambda.cli.do_cli")
diff --git a/tests/unit/hook_packages/terraform/hooks/prepare/resources/test_apigw.py b/tests/unit/hook_packages/terraform/hooks/prepare/resources/test_apigw.py
index 6d7593662f..26172f44d3 100644
--- a/tests/unit/hook_packages/terraform/hooks/prepare/resources/test_apigw.py
+++ b/tests/unit/hook_packages/terraform/hooks/prepare/resources/test_apigw.py
@@ -40,6 +40,7 @@ def test_validate_invalid(self, mock_unsupported_reference_field):
     @parameterized.expand(
         [
             ({"field": "a"}, TFResource("address", "", Mock(), {}), False),
+            ({"values": {"field": "a"}}, TFResource("address", "", Mock(), {}), False),
             ({}, TFResource("address", "", Mock(), {"field": ConstantValue("a")}), False),
             ({}, TFResource("address", "", Mock(), {"field": References(["a"])}), True),
         ]
diff --git a/tests/unit/hook_packages/terraform/hooks/prepare/test_property_builder.py b/tests/unit/hook_packages/terraform/hooks/prepare/test_property_builder.py
index 1e4b1feede..eab561f35c 100644
--- a/tests/unit/hook_packages/terraform/hooks/prepare/test_property_builder.py
+++ b/tests/unit/hook_packages/terraform/hooks/prepare/test_property_builder.py
@@ -1,10 +1,12 @@
 """Test Terraform property builder"""
+import json
 from unittest.mock import patch, Mock, call
 from parameterized import parameterized
 
 from samcli.hook_packages.terraform.hooks.prepare.property_builder import (
     _build_code_property,
     REMOTE_DUMMY_VALUE,
+    _get_json_body,
     _get_property_extractor,
     _build_lambda_function_environment_property,
     _build_lambda_function_image_config_property,
@@ -194,3 +196,21 @@ def test_check_image_config_value_invalid_length(self):
         f"aws_lambda_function resource in the terraform plan output, but there are {len(image_config)} items"
         with self.assertRaises(PrepareHookException, msg=expected_message):
             _check_image_config_value(image_config)
+
+    def test_get_json_body(self):
+        body_object = {"foo": "bar"}
+
+        result = _get_json_body({"body": json.dumps(body_object)}, Mock())
+
+        self.assertEqual(result, body_object)
+
+    @parameterized.expand(
+        [
+            (Mock(),),  # wrong type
+            ("not valid json",),  # not valid json
+        ]
+    )
+    def test_get_json_body_invalid(self, invalid_value):
+        result = _get_json_body({"body": invalid_value}, Mock())
+
+        self.assertEqual(result, invalid_value)
diff --git a/tests/unit/hook_packages/terraform/hooks/prepare/test_translate.py b/tests/unit/hook_packages/terraform/hooks/prepare/test_translate.py
index e8309379db..5ccf8bb100 100644
--- a/tests/unit/hook_packages/terraform/hooks/prepare/test_translate.py
+++ b/tests/unit/hook_packages/terraform/hooks/prepare/test_translate.py
@@ -1,7 +1,8 @@
 """Test Terraform prepare translate"""
 import copy
+from unittest import TestCase
 from unittest.mock import Mock, call, patch, MagicMock, ANY
-from samcli.lib.utils.colors import Colored
+from samcli.lib.utils.colors import Colored, Colors
 
 from tests.unit.hook_packages.terraform.hooks.prepare.prepare_base import PrepareHookUnitBase
 from samcli.hook_packages.terraform.hooks.prepare.property_builder import (
@@ -1112,7 +1113,7 @@ def test_translating_apigw_integration_response_method(self):
         self.assertEqual(translated_cfn_properties, self.expected_internal_apigw_integration_response_properties)
 
 
-class TestUnresolvableAttributeCheck:
+class TestUnresolvableAttributeCheck(TestCase):
     @patch("samcli.hook_packages.terraform.hooks.prepare.translate.RESOURCE_TRANSLATOR_MAPPING")
     @patch("samcli.hook_packages.terraform.hooks.prepare.translate.LOG")
     def test_module_contains_unresolvables(self, log_mock, mapping_mock):
@@ -1136,5 +1137,9 @@ def test_module_contains_unresolvables(self, log_mock, mapping_mock):
         _check_unresolvable_values(module, tf_module)
 
         log_mock.warning.assert_called_with(
-            Colored().yellow("\nUnresolvable attributes discovered in project, run terraform apply to resolve them.\n")
+            Colored().color_log(
+                msg="\nUnresolvable attributes discovered in project, run terraform apply to resolve them.\n",
+                color=Colors.WARNING,
+            ),
+            extra=dict(markup=True),
         )

From 6c9939e3bcbc8434502fb4728a330524f6afc373 Mon Sep 17 00:00:00 2001
From: Lucas <12496191+lucashuy@users.noreply.github.com>
Date: Mon, 3 Jul 2023 12:11:12 -0700
Subject: [PATCH 14/15] Updated warning message about missing function in
 template (#5347)

Co-authored-by: Wing Fung Lau <4760060+hawflau@users.noreply.github.com>
---
 samcli/local/apigw/local_apigw_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samcli/local/apigw/local_apigw_service.py b/samcli/local/apigw/local_apigw_service.py
index e63a8775e7..f979b2e9a3 100644
--- a/samcli/local/apigw/local_apigw_service.py
+++ b/samcli/local/apigw/local_apigw_service.py
@@ -686,7 +686,7 @@ def _request_handler(self, **kwargs):
 
             LOG.warning(
                 "Failed to find a Function to invoke a Lambda authorizer, verify that "
-                "this Function exists locally if it is not a remote resource."
+                "this Function is defined and exists locally in the template."
             )
         except Exception as ex:
             # re-raise the catch all exception after we track it in our telemetry

From ed93c2aa6720825c2077d0c8c2f24bfeb37bb973 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 21:16:22 +0000
Subject: [PATCH 15/15] chore(deps-dev): bump types-pywin32 in /requirements
 (#5436)

Bumps [types-pywin32](https://github.com/python/typeshed) from 306.0.0.0 to 306.0.0.2.
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-pywin32
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements/dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/dev.txt b/requirements/dev.txt
index 4370b187ca..2421d05095 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -9,7 +9,7 @@ pytest-cov==4.1.0
 # here we fix its version and upgrade it manually in the future
 mypy==1.3.0
 boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray]==1.26.131
-types-pywin32==306.0.0.0
+types-pywin32==306.0.0.2
 types-PyYAML==6.0.12
 types-chevron==0.14.2.4
 types-psutil==5.9.5.12