aws-sam-cli 1.165.0__tar.gz → 1.166.1__tar.gz

{aws_sam_cli-1.165.0/aws_sam_cli.egg-info → aws_sam_cli-1.166.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-sam-cli
-Version: 1.165.0
+Version: 1.166.1
 Summary: AWS SAM CLI is a CLI tool for local development and testing of Serverless applications
 Author-email: Amazon Web Services <aws-sam-developers@amazon.com>
 License-Expression: Apache-2.0
@@ -30,56 +30,59 @@ License-File: NOTICE
 Requires-Dist: chevron~=0.12
 Requires-Dist: click==8.1.8
 Requires-Dist: Flask<3.2
-Requires-Dist: boto3[crt]==1.43.38
+Requires-Dist: boto3[crt]==1.43.83
 Requires-Dist: jmespath~=1.1.0
 Requires-Dist: ruamel_yaml~=0.19.1
 Requires-Dist: PyYAML~=6.0
 Requires-Dist: cookiecutter<2.8,>=2.6
-Requires-Dist: aws-sam-translator==1.111.0
-Requires-Dist: docker~=7.1.0
+Requires-Dist: aws-sam-translator==1.113.0
+Requires-Dist: docker<7.3,>=7.1
 Requires-Dist: dateparser~=1.3
 Requires-Dist: requests<2.35.0,>=2.32.5
-Requires-Dist: aws_lambda_builders==1.66.0
-Requires-Dist: tomlkit==0.15.0
+Requires-Dist: aws_lambda_builders==1.67.0
+Requires-Dist: tomlkit==0.15.1
 Requires-Dist: watchdog==4.0.2
 Requires-Dist: rich<15.1.0,>=14.3.3
-Requires-Dist: pyopenssl<26.4,>=25.3
+Requires-Dist: pyopenssl<26.5,>=25.3
 Requires-Dist: jsonschema<4.27
 Requires-Dist: typing_extensions<5,>=4.4.0
 Requires-Dist: regex!=2021.10.8
-Requires-Dist: tzlocal==5.3.1
-Requires-Dist: cfn-lint<1.53,>=1.51.3
+Requires-Dist: tzlocal==5.4.4
+Requires-Dist: cfn-lint<1.54,>=1.52.0
 Requires-Dist: boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]>=1.41.0
 Requires-Dist: python-dotenv<1.3,>=1.0
+Provides-Extra: rust-tests
+Requires-Dist: cargo-lambda==1.9.2; extra == "rust-tests"
+Requires-Dist: ziglang==0.16.0; extra == "rust-tests"
 Provides-Extra: pre-dev
-Requires-Dist: ruff==0.15.13; extra == "pre-dev"
+Requires-Dist: ruff==0.16.5; extra == "pre-dev"
 Provides-Extra: dev
 Requires-Dist: aws-sam-cli[pre-dev]; extra == "dev"
-Requires-Dist: coverage==7.14.0; extra == "dev"
+Requires-Dist: coverage==7.16.0; extra == "dev"
 Requires-Dist: pytest-cov==7.1.0; extra == "dev"
-Requires-Dist: mypy==2.1.0; extra == "dev"
-Requires-Dist: types-pywin32==311.0.0.20260508; extra == "dev"
-Requires-Dist: types-PyYAML==6.0.12.20260518; extra == "dev"
+Requires-Dist: mypy==2.3.1; extra == "dev"
+Requires-Dist: types-pywin32==312.0.0.20260827; extra == "dev"
+Requires-Dist: types-PyYAML==6.0.12.20260815; extra == "dev"
 Requires-Dist: types-chevron==0.14.2.20260408; extra == "dev"
-Requires-Dist: types-psutil==7.2.2.20260518; extra == "dev"
-Requires-Dist: types-setuptools==82.0.0.20260518; extra == "dev"
-Requires-Dist: types-Pygments==2.20.0.20260518; extra == "dev"
+Requires-Dist: types-psutil==7.2.2.20260827; extra == "dev"
+Requires-Dist: types-setuptools==84.0.0.20260812; extra == "dev"
+Requires-Dist: types-Pygments==2.21.0.20260819; extra == "dev"
 Requires-Dist: types-colorama==0.4.15.20260508; extra == "dev"
-Requires-Dist: types-dateparser==1.4.1.20260617; extra == "dev"
-Requires-Dist: types-docutils==0.22.3.20260518; extra == "dev"
-Requires-Dist: types-jsonschema==4.26.0.20260508; extra == "dev"
+Requires-Dist: types-dateparser==1.4.2.20260813; extra == "dev"
+Requires-Dist: types-docutils==0.23.0.20260827; extra == "dev"
+Requires-Dist: types-jsonschema==4.26.0.20260518; extra == "dev"
 Requires-Dist: types-pyOpenSSL==24.1.0.20240722; extra == "dev"
-Requires-Dist: types-requests==2.33.0.20260518; extra == "dev"
+Requires-Dist: types-requests==2.33.0.20260712; extra == "dev"
 Requires-Dist: types-urllib3==1.26.25.14; extra == "dev"
-Requires-Dist: pytest==9.0.3; extra == "dev"
+Requires-Dist: pytest==9.1.1; extra == "dev"
 Requires-Dist: parameterized==0.9.0; extra == "dev"
 Requires-Dist: pytest-xdist==3.8.0; extra == "dev"
-Requires-Dist: pytest-forked==1.6.0; extra == "dev"
+Requires-Dist: pytest-forked==1.7.5; extra == "dev"
 Requires-Dist: pytest-timeout==2.4.0; extra == "dev"
-Requires-Dist: pytest-rerunfailures==16.3; extra == "dev"
+Requires-Dist: pytest-rerunfailures==16.6; extra == "dev"
 Requires-Dist: pytest-metadata==3.1.1; extra == "dev"
 Requires-Dist: pytest-json-report-wip==1.5.1; extra == "dev"
-Requires-Dist: filelock==3.29.0; extra == "dev"
+Requires-Dist: filelock==3.32.4; extra == "dev"
 Requires-Dist: black==26.5.1; extra == "dev"
 Requires-Dist: psutil==7.2.2; extra == "dev"
 Requires-Dist: chardet<6; extra == "dev"

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1/aws_sam_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-sam-cli
-Version: 1.165.0
+Version: 1.166.1
 Summary: AWS SAM CLI is a CLI tool for local development and testing of Serverless applications
 Author-email: Amazon Web Services <aws-sam-developers@amazon.com>
 License-Expression: Apache-2.0
@@ -30,56 +30,59 @@ License-File: NOTICE
 Requires-Dist: chevron~=0.12
 Requires-Dist: click==8.1.8
 Requires-Dist: Flask<3.2
-Requires-Dist: boto3[crt]==1.43.38
+Requires-Dist: boto3[crt]==1.43.83
 Requires-Dist: jmespath~=1.1.0
 Requires-Dist: ruamel_yaml~=0.19.1
 Requires-Dist: PyYAML~=6.0
 Requires-Dist: cookiecutter<2.8,>=2.6
-Requires-Dist: aws-sam-translator==1.111.0
-Requires-Dist: docker~=7.1.0
+Requires-Dist: aws-sam-translator==1.113.0
+Requires-Dist: docker<7.3,>=7.1
 Requires-Dist: dateparser~=1.3
 Requires-Dist: requests<2.35.0,>=2.32.5
-Requires-Dist: aws_lambda_builders==1.66.0
-Requires-Dist: tomlkit==0.15.0
+Requires-Dist: aws_lambda_builders==1.67.0
+Requires-Dist: tomlkit==0.15.1
 Requires-Dist: watchdog==4.0.2
 Requires-Dist: rich<15.1.0,>=14.3.3
-Requires-Dist: pyopenssl<26.4,>=25.3
+Requires-Dist: pyopenssl<26.5,>=25.3
 Requires-Dist: jsonschema<4.27
 Requires-Dist: typing_extensions<5,>=4.4.0
 Requires-Dist: regex!=2021.10.8
-Requires-Dist: tzlocal==5.3.1
-Requires-Dist: cfn-lint<1.53,>=1.51.3
+Requires-Dist: tzlocal==5.4.4
+Requires-Dist: cfn-lint<1.54,>=1.52.0
 Requires-Dist: boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]>=1.41.0
 Requires-Dist: python-dotenv<1.3,>=1.0
+Provides-Extra: rust-tests
+Requires-Dist: cargo-lambda==1.9.2; extra == "rust-tests"
+Requires-Dist: ziglang==0.16.0; extra == "rust-tests"
 Provides-Extra: pre-dev
-Requires-Dist: ruff==0.15.13; extra == "pre-dev"
+Requires-Dist: ruff==0.16.5; extra == "pre-dev"
 Provides-Extra: dev
 Requires-Dist: aws-sam-cli[pre-dev]; extra == "dev"
-Requires-Dist: coverage==7.14.0; extra == "dev"
+Requires-Dist: coverage==7.16.0; extra == "dev"
 Requires-Dist: pytest-cov==7.1.0; extra == "dev"
-Requires-Dist: mypy==2.1.0; extra == "dev"
-Requires-Dist: types-pywin32==311.0.0.20260508; extra == "dev"
-Requires-Dist: types-PyYAML==6.0.12.20260518; extra == "dev"
+Requires-Dist: mypy==2.3.1; extra == "dev"
+Requires-Dist: types-pywin32==312.0.0.20260827; extra == "dev"
+Requires-Dist: types-PyYAML==6.0.12.20260815; extra == "dev"
 Requires-Dist: types-chevron==0.14.2.20260408; extra == "dev"
-Requires-Dist: types-psutil==7.2.2.20260518; extra == "dev"
-Requires-Dist: types-setuptools==82.0.0.20260518; extra == "dev"
-Requires-Dist: types-Pygments==2.20.0.20260518; extra == "dev"
+Requires-Dist: types-psutil==7.2.2.20260827; extra == "dev"
+Requires-Dist: types-setuptools==84.0.0.20260812; extra == "dev"
+Requires-Dist: types-Pygments==2.21.0.20260819; extra == "dev"
 Requires-Dist: types-colorama==0.4.15.20260508; extra == "dev"
-Requires-Dist: types-dateparser==1.4.1.20260617; extra == "dev"
-Requires-Dist: types-docutils==0.22.3.20260518; extra == "dev"
-Requires-Dist: types-jsonschema==4.26.0.20260508; extra == "dev"
+Requires-Dist: types-dateparser==1.4.2.20260813; extra == "dev"
+Requires-Dist: types-docutils==0.23.0.20260827; extra == "dev"
+Requires-Dist: types-jsonschema==4.26.0.20260518; extra == "dev"
 Requires-Dist: types-pyOpenSSL==24.1.0.20240722; extra == "dev"
-Requires-Dist: types-requests==2.33.0.20260518; extra == "dev"
+Requires-Dist: types-requests==2.33.0.20260712; extra == "dev"
 Requires-Dist: types-urllib3==1.26.25.14; extra == "dev"
-Requires-Dist: pytest==9.0.3; extra == "dev"
+Requires-Dist: pytest==9.1.1; extra == "dev"
 Requires-Dist: parameterized==0.9.0; extra == "dev"
 Requires-Dist: pytest-xdist==3.8.0; extra == "dev"
-Requires-Dist: pytest-forked==1.6.0; extra == "dev"
+Requires-Dist: pytest-forked==1.7.5; extra == "dev"
 Requires-Dist: pytest-timeout==2.4.0; extra == "dev"
-Requires-Dist: pytest-rerunfailures==16.3; extra == "dev"
+Requires-Dist: pytest-rerunfailures==16.6; extra == "dev"
 Requires-Dist: pytest-metadata==3.1.1; extra == "dev"
 Requires-Dist: pytest-json-report-wip==1.5.1; extra == "dev"
-Requires-Dist: filelock==3.29.0; extra == "dev"
+Requires-Dist: filelock==3.32.4; extra == "dev"
 Requires-Dist: black==26.5.1; extra == "dev"
 Requires-Dist: psutil==7.2.2; extra == "dev"
 Requires-Dist: chardet<6; extra == "dev"

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/aws_sam_cli.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ samcli/commands/_utils/custom_options/__init__.py
 samcli/commands/_utils/custom_options/hook_name_option.py
 samcli/commands/_utils/custom_options/option_nargs.py
 samcli/commands/_utils/custom_options/replace_help_option.py
+samcli/commands/_utils/custom_options/structured_output_option.py
 samcli/commands/bootstrap/__init__.py
 samcli/commands/bootstrap/command.py
 samcli/commands/build/__init__.py
@@ -781,6 +782,7 @@ samcli/lib/utils/stream_writer.py
 samcli/lib/utils/subprocess_utils.py
 samcli/lib/utils/system_info.py
 samcli/lib/utils/tar.py
+samcli/lib/utils/template_hooks.py
 samcli/lib/utils/time.py
 samcli/lib/utils/version_checker.py
 samcli/lib/warnings/__init__.py

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/aws_sam_cli.egg-info/requires.txt

@@ -1,58 +1,62 @@
 chevron~=0.12
 click==8.1.8
 Flask<3.2
-boto3[crt]==1.43.38
+boto3[crt]==1.43.83
 jmespath~=1.1.0
 ruamel_yaml~=0.19.1
 PyYAML~=6.0
 cookiecutter<2.8,>=2.6
-aws-sam-translator==1.111.0
-docker~=7.1.0
+aws-sam-translator==1.113.0
+docker<7.3,>=7.1
 dateparser~=1.3
 requests<2.35.0,>=2.32.5
-aws_lambda_builders==1.66.0
-tomlkit==0.15.0
+aws_lambda_builders==1.67.0
+tomlkit==0.15.1
 watchdog==4.0.2
 rich<15.1.0,>=14.3.3
-pyopenssl<26.4,>=25.3
+pyopenssl<26.5,>=25.3
 jsonschema<4.27
 typing_extensions<5,>=4.4.0
 regex!=2021.10.8
-tzlocal==5.3.1
-cfn-lint<1.53,>=1.51.3
+tzlocal==5.4.4
+cfn-lint<1.54,>=1.52.0
 boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]>=1.41.0
 python-dotenv<1.3,>=1.0
 
 [dev]
 aws-sam-cli[pre-dev]
-coverage==7.14.0
+coverage==7.16.0
 pytest-cov==7.1.0
-mypy==2.1.0
-types-pywin32==311.0.0.20260508
-types-PyYAML==6.0.12.20260518
+mypy==2.3.1
+types-pywin32==312.0.0.20260827
+types-PyYAML==6.0.12.20260815
 types-chevron==0.14.2.20260408
-types-psutil==7.2.2.20260518
-types-setuptools==82.0.0.20260518
-types-Pygments==2.20.0.20260518
+types-psutil==7.2.2.20260827
+types-setuptools==84.0.0.20260812
+types-Pygments==2.21.0.20260819
 types-colorama==0.4.15.20260508
-types-dateparser==1.4.1.20260617
-types-docutils==0.22.3.20260518
-types-jsonschema==4.26.0.20260508
+types-dateparser==1.4.2.20260813
+types-docutils==0.23.0.20260827
+types-jsonschema==4.26.0.20260518
 types-pyOpenSSL==24.1.0.20240722
-types-requests==2.33.0.20260518
+types-requests==2.33.0.20260712
 types-urllib3==1.26.25.14
-pytest==9.0.3
+pytest==9.1.1
 parameterized==0.9.0
 pytest-xdist==3.8.0
-pytest-forked==1.6.0
+pytest-forked==1.7.5
 pytest-timeout==2.4.0
-pytest-rerunfailures==16.3
+pytest-rerunfailures==16.6
 pytest-metadata==3.1.1
 pytest-json-report-wip==1.5.1
-filelock==3.29.0
+filelock==3.32.4
 black==26.5.1
 psutil==7.2.2
 chardet<6
 
 [pre-dev]
-ruff==0.15.13
+ruff==0.16.5
+
+[rust-tests]
+cargo-lambda==1.9.2
+ziglang==0.16.0

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/pyproject.toml

@@ -35,63 +35,70 @@ dependencies = [
     "chevron~=0.12",
     "click==8.1.8",
     "Flask<3.2",
-    "boto3[crt]==1.43.38",
+    "boto3[crt]==1.43.83",
     "jmespath~=1.1.0",
     "ruamel_yaml~=0.19.1",
     "PyYAML~=6.0",
     "cookiecutter>=2.6,<2.8",
-    "aws-sam-translator==1.111.0",
+    "aws-sam-translator==1.113.0",
     # docker minor version updates can include breaking changes. Auto update micro version only.
-    "docker~=7.1.0",
+    "docker>=7.1,<7.3",
     "dateparser~=1.3",
     "requests>=2.32.5,<2.35.0",
-    "aws_lambda_builders==1.66.0",
-    "tomlkit==0.15.0",
+    "aws_lambda_builders==1.67.0",
+    "tomlkit==0.15.1",
     "watchdog==4.0.2",
     "rich>=14.3.3,<15.1.0",
-    "pyopenssl>=25.3,<26.4",
+    "pyopenssl>=25.3,<26.5",
     # Pin to <4.27 until SAM-T no longer uses RefResolver
     "jsonschema<4.27",
     "typing_extensions>=4.4.0,<5",
     # regex is not a direct dependency of SAM CLI, exclude version 2021.10.8 due to not working on M1 Mac
     "regex!=2021.10.8",
-    "tzlocal==5.3.1",
-    "cfn-lint>=1.51.3,<1.53",
+    "tzlocal==5.4.4",
+    # Bounded to the versions that lint every SAM resource type, see #9249
+    "cfn-lint>=1.52.0,<1.54",
     "boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]>=1.41.0",
     "python-dotenv>=1.0,<1.3",
 ]
 
 [project.optional-dependencies]
+# Rust build tooling for the Rust integration tests. Pinned here rather than in the
+# workflows so Dependabot keeps them current; kept out of `dev` since only Rust jobs need it.
+rust-tests = [
+    "cargo-lambda==1.9.2",
+    "ziglang==0.16.0",
+]
 pre-dev = [
-    "ruff==0.15.13",
+    "ruff==0.16.5",
 ]
 dev = [
     "aws-sam-cli[pre-dev]",
-    "coverage==7.14.0",
+    "coverage==7.16.0",
     "pytest-cov==7.1.0",
-    "mypy==2.1.0",
-    "types-pywin32==311.0.0.20260508",
-    "types-PyYAML==6.0.12.20260518",
+    "mypy==2.3.1",
+    "types-pywin32==312.0.0.20260827",
+    "types-PyYAML==6.0.12.20260815",
     "types-chevron==0.14.2.20260408",
-    "types-psutil==7.2.2.20260518",
-    "types-setuptools==82.0.0.20260518",
-    "types-Pygments==2.20.0.20260518",
+    "types-psutil==7.2.2.20260827",
+    "types-setuptools==84.0.0.20260812",
+    "types-Pygments==2.21.0.20260819",
     "types-colorama==0.4.15.20260508",
-    "types-dateparser==1.4.1.20260617",
-    "types-docutils==0.22.3.20260518",
-    "types-jsonschema==4.26.0.20260508",
+    "types-dateparser==1.4.2.20260813",
+    "types-docutils==0.23.0.20260827",
+    "types-jsonschema==4.26.0.20260518",
     "types-pyOpenSSL==24.1.0.20240722",
-    "types-requests==2.33.0.20260518",
+    "types-requests==2.33.0.20260712",
     "types-urllib3==1.26.25.14",
-    "pytest==9.0.3",
+    "pytest==9.1.1",
     "parameterized==0.9.0",
     "pytest-xdist==3.8.0",
-    "pytest-forked==1.6.0",
+    "pytest-forked==1.7.5",
     "pytest-timeout==2.4.0",
-    "pytest-rerunfailures==16.3",
+    "pytest-rerunfailures==16.6",
     "pytest-metadata==3.1.1",
     "pytest-json-report-wip==1.5.1",
-    "filelock==3.29.0",
+    "filelock==3.32.4",
     "black==26.5.1",
     "psutil==7.2.2",
     "chardet<6",
@@ -117,7 +124,7 @@ select = [
     "I",  # isort
     "TID", # flake8-tidy-imports
 ]
-ignore = ["PLR0913", "PLC0415", "PLW1641"]
+ignore = ["PLR0913", "PLC0415", "PLW1641", "PLR0917"]
 
 [tool.ruff.lint.flake8-tidy-imports]
 ban-relative-imports = "all"

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.165.0"
+__version__ = "1.166.1"

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/samcli/cli/cli_config_file.py

@@ -16,6 +16,7 @@ import click
 from click.core import ParameterSource
 
 from samcli.cli.context import Context, get_cmd_names
+from samcli.commands._utils.custom_options.structured_output_option import StructuredOutputOption
 from samcli.commands.exceptions import ConfigException
 from samcli.lib.config.samconfig import DEFAULT_CONFIG_FILE_NAME, DEFAULT_ENV, SamConfig
 from samcli.lib.utils.defaults import get_default_aws_region
@@ -308,6 +309,14 @@ def save_command_line_args_to_config(
         "config_env",
     ]
 
+    # The shared structured output flag describes how a single run reports rather than what to
+    # build, so persisting it would change the output format of later runs, and for sam init it
+    # would make the interactive flow unreachable. Matched by option type, because sam list and
+    # sam remote invoke define an unrelated --output that is a display preference worth saving.
+    params_to_exclude += [
+        param.name for param in ctx.command.params if isinstance(param, StructuredOutputOption) and param.name
+    ]
+
     saved_params = {}
     for param_name, param_source in ctx._parameter_source.items():
         if param_name in params_to_exclude:

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/samcli/commands/_utils/cdk_support_decorators.py

@@ -33,9 +33,13 @@ def unsupported_command_cdk(alternative_command=None):
                 return func(*args, **kwargs)
 
             if is_cdk_project(template_dict):
-                click.secho("Warning: CDK apps are not officially supported with this command.", fg="yellow")
+                # Advisory notice: write to stderr so it never corrupts the stdout stream a command
+                # emits in --output json mode (matches SAM's other advisory/telemetry notices).
+                click.secho("Warning: CDK apps are not officially supported with this command.", fg="yellow", err=True)
                 if alternative_command:
-                    click.secho(f"We recommend you use this alternative command: {alternative_command}", fg="yellow")
+                    click.secho(
+                        f"We recommend you use this alternative command: {alternative_command}", fg="yellow", err=True
+                    )
 
             return func(*args, **kwargs)
 

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/samcli/commands/_utils/constants.py

@@ -9,3 +9,7 @@ DEFAULT_BUILD_DIR = os.path.join(".aws-sam", "build")
 DEFAULT_BUILD_DIR_WITH_AUTO_DEPENDENCY_LAYER = os.path.join(".aws-sam", "auto-dependency-layer")
 DEFAULT_CACHE_DIR = os.path.join(".aws-sam", "cache")
 DEFAULT_BUILT_TEMPLATE_PATH = os.path.join(".aws-sam", "build", "template.yaml")
+
+# Template file names SAM CLI recognises, in resolution order. Order matters, so that a template
+# path reported by one command is the one another command would resolve to.
+SAM_TEMPLATE_FILE_NAMES = ["template.yaml", "template.yml", "template.json"]

aws_sam_cli-1.166.1/samcli/commands/_utils/custom_options/structured_output_option.py

@@ -0,0 +1,14 @@
+"""
+Custom click option for the shared structured output flag
+"""
+
+import click
+
+
+class StructuredOutputOption(click.Option):
+    """Marks the shared --output option that selects structured (JSON) output.
+
+    Exists so the option can be recognised by type rather than by name. Other commands, such as
+    sam list and sam remote invoke, have an unrelated --output that selects a display format and
+    is worth saving to a config file, while this one describes how a single run reports.
+    """

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/samcli/commands/_utils/experimental.py

@@ -272,7 +272,7 @@ def prompt_experimental(
     if is_experimental_enabled(config_entry):
         update_experimental_context()
         return True
-    confirmed = click.confirm(Colored().yellow(prompt), default=False)
+    confirmed = click.confirm(Colored().yellow(prompt), default=False, err=True)
     if confirmed:
         set_experimental(config_entry=config_entry, enabled=True)
         update_experimental_context()

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/samcli/commands/_utils/options.py

@@ -26,10 +26,12 @@ from samcli.commands._utils.constants import (
     DEFAULT_BUILT_TEMPLATE_PATH,
     DEFAULT_CACHE_DIR,
     DEFAULT_STACK_NAME,
+    SAM_TEMPLATE_FILE_NAMES,
 )
 from samcli.commands._utils.custom_options.hook_name_option import HookNameOption
 from samcli.commands._utils.custom_options.option_nargs import OptionNargs
 from samcli.commands._utils.custom_options.replace_help_option import ReplaceHelpSummaryOption
+from samcli.commands._utils.custom_options.structured_output_option import StructuredOutputOption
 from samcli.commands._utils.parameterized_option import parameterized_option
 from samcli.commands._utils.template import TemplateNotFoundException, get_template_artifacts_format, get_template_data
 from samcli.lib.hook.hook_wrapper import get_available_hook_packages_ids
@@ -65,7 +67,7 @@ def get_or_default_template_file_name(ctx, param, provided_value, include_build)
 
     original_template_path = os.path.abspath(provided_value)
 
-    search_paths = ["template.yaml", "template.yml", "template.json"]
+    search_paths = list(SAM_TEMPLATE_FILE_NAMES)
 
     if include_build:
         search_paths.insert(0, DEFAULT_BUILT_TEMPLATE_PATH)
@@ -447,6 +449,28 @@ def common_observability_options(f):
     return f
 
 
+def structured_output_click_option():
+    """Shared --output option for commands that support structured (JSON) output.
+
+    Uses text|json choices matching the OutputOption enum in samcli.lib.observability.util.
+    Intended as the single shared contract for all commands adopting --output json.
+    """
+    return click.option(
+        "--output",
+        default=OutputOption.text.value,
+        help="Output the results from the command in a given output format. "
+        "Supported formats: text (default), json.",
+        # Derive choices from OutputOption so the accepted CLI values cannot drift from the enum.
+        type=click.Choice([option.value for option in OutputOption], case_sensitive=False),
+        # Lets --save-params recognise this option by type, so it is not persisted.
+        cls=StructuredOutputOption,
+    )
+
+
+def structured_output_option(f):
+    return structured_output_click_option()(f)
+
+
 def metadata_click_option():
     return click.option(
         "--metadata",

{aws_sam_cli-1.165.0 → aws_sam_cli-1.166.1}/samcli/commands/_utils/table_print.py

@@ -10,6 +10,8 @@ from typing import Sized
 
 import click
 
+from samcli.lib.observability.util import OutputOption
+
 MIN_OFFSET = 20
 
 
@@ -62,6 +64,17 @@ def pprint_column_names(
 
         @wraps(func)
         def wrap(*args, **kwargs):
+            output_mode = kwargs.pop("output_mode", OutputOption.text.value)
+            # Validate loudly: an unrecognized value (e.g. a typo) must raise rather than silently
+            # fall through to table output, which would corrupt a caller's stdout JSON stream.
+            if output_mode not in (OutputOption.text.value, OutputOption.json.value):
+                raise ValueError(f"Unsupported output_mode: {output_mode!r}")
+            if output_mode == OutputOption.json.value:
+                # In JSON mode the wrapped function emits its own structured output; skip the table
+                # chrome. The function is responsible for not referencing the width/margin/format_args
+                # kwargs injected below (today both JSON-capable callers branch on output_mode first).
+                kwargs["output_mode"] = output_mode
+                return func(*args, **kwargs)
             # The table is setup with the column names, format_string contains the column names.
             if table_header:
                 click.secho(