Merge branch 'develop' into sync-timestamp

requirements/base.txt

@@ -6,7 +6,7 @@ jmespath~=1.0.1
 ruamel_yaml~=0.18.5
 PyYAML~=6.0,>=6.0.1
 cookiecutter~=2.5.0
-aws-sam-translator==1.83.0
+aws-sam-translator==1.84.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.0.0
 dateparser~=1.2

requirements/dev.txt

@@ -11,10 +11,10 @@ mypy==1.8.0
 types-pywin32==306.0.0.20240130
 types-PyYAML==6.0.12.12
 types-chevron==0.14.2.20240106
-types-psutil==5.9.5.20240106
+types-psutil==5.9.5.20240205
 types-setuptools==69.0.0.20240125
 types-Pygments==2.17.0.20240106 
-types-colorama==0.4.15.20240106
+types-colorama==0.4.15.20240205
 types-dateparser==1.1.4.20240106
 types-docutils==0.20.0.20240201
 types-jsonschema==4.21.0.20240118
@@ -36,5 +36,5 @@ pytest-json-report==1.5.0
 filelock==3.13.1
 
 # formatter
-black==23.12.1
+black==24.1.1
 psutil==5.9.8

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.1.15
+ruff==0.2.0

requirements/reproducible-linux.txt

@@ -24,9 +24,9 @@ aws-lambda-builders==1.45.0 \
     --hash=sha256:5c19a6628eecf21578cd9c521e747f4a2163c62c527cd840b11b62a10b661348 \
     --hash=sha256:a4db7766198c052900905bd7ee3b1a8b486511394cdabffed054204d43b29943
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.83.0 \
-    --hash=sha256:022246b4745cc9067f88ab2b051f49898606bcf0222e22b9da41063e5619c6f9 \
-    --hash=sha256:46025ca8894a56eacd87eb0e4f9af5c01c567c9a734b97fbba353bffd56ba5dc
+aws-sam-translator==1.84.0 \
+    --hash=sha256:a24f43e80095c79258a1f1c7a0b8169f55daf0b2bc237d5b9010b02ba86fa3bb \
+    --hash=sha256:dbfd5669b5ef4bd7bc7af4775eec2ce4db61a2c2a17d721e67b51cf6a6dd63f9
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint
@@ -60,9 +60,9 @@ botocore-stubs==1.34.32 \
     --hash=sha256:978c97b8c02b5ffa3726a5052e5715aecc52c640a75a8088b3a58453c2b054b2 \
     --hash=sha256:e5b04b8ab81e736088470b7be244de072ac2f986caf0f51b7e2087400778dc9f
     # via boto3-stubs
-certifi==2023.11.17 \
-    --hash=sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1 \
-    --hash=sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474
+certifi==2024.2.2 \
+    --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \
+    --hash=sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1
     # via requests
 cffi==1.16.0 \
     --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
@@ -585,9 +585,9 @@ python-slugify==8.0.3 \
     --hash=sha256:c71189c161e8c671f1b141034d9a56308a8a5978cd13d40446c879569212fdd1 \
     --hash=sha256:e04cba5f1c562502a1175c84a8bc23890c54cdaf23fccaaf0bf78511508cabed
     # via cookiecutter
-pytz==2023.4 \
-    --hash=sha256:31d4583c4ed539cd037956140d695e42c033a19e984bfce9964a3f7d59bc2b40 \
-    --hash=sha256:f90ef520d95e7c46951105338d918664ebfd6f1d995bd7d153127ce90efafa6a
+pytz==2024.1 \
+    --hash=sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812 \
+    --hash=sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319
     # via dateparser
 pyyaml==6.0.1 \
     --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \

requirements/reproducible-mac.txt

@@ -24,9 +24,9 @@ aws-lambda-builders==1.45.0 \
     --hash=sha256:5c19a6628eecf21578cd9c521e747f4a2163c62c527cd840b11b62a10b661348 \
     --hash=sha256:a4db7766198c052900905bd7ee3b1a8b486511394cdabffed054204d43b29943
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.83.0 \
-    --hash=sha256:022246b4745cc9067f88ab2b051f49898606bcf0222e22b9da41063e5619c6f9 \
-    --hash=sha256:46025ca8894a56eacd87eb0e4f9af5c01c567c9a734b97fbba353bffd56ba5dc
+aws-sam-translator==1.84.0 \
+    --hash=sha256:a24f43e80095c79258a1f1c7a0b8169f55daf0b2bc237d5b9010b02ba86fa3bb \
+    --hash=sha256:dbfd5669b5ef4bd7bc7af4775eec2ce4db61a2c2a17d721e67b51cf6a6dd63f9
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint
@@ -78,9 +78,9 @@ botocore-stubs==1.34.32 \
     --hash=sha256:978c97b8c02b5ffa3726a5052e5715aecc52c640a75a8088b3a58453c2b054b2 \
     --hash=sha256:e5b04b8ab81e736088470b7be244de072ac2f986caf0f51b7e2087400778dc9f
     # via boto3-stubs
-certifi==2023.11.17 \
-    --hash=sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1 \
-    --hash=sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474
+certifi==2024.2.2 \
+    --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \
+    --hash=sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1
     # via requests
 cffi==1.16.0 \
     --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
@@ -617,9 +617,9 @@ python-slugify==8.0.3 \
     --hash=sha256:c71189c161e8c671f1b141034d9a56308a8a5978cd13d40446c879569212fdd1 \
     --hash=sha256:e04cba5f1c562502a1175c84a8bc23890c54cdaf23fccaaf0bf78511508cabed
     # via cookiecutter
-pytz==2023.4 \
-    --hash=sha256:31d4583c4ed539cd037956140d695e42c033a19e984bfce9964a3f7d59bc2b40 \
-    --hash=sha256:f90ef520d95e7c46951105338d918664ebfd6f1d995bd7d153127ce90efafa6a
+pytz==2024.1 \
+    --hash=sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812 \
+    --hash=sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319
     # via dateparser
 pyyaml==6.0.1 \
     --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \

requirements/reproducible-win.txt

@@ -24,9 +24,9 @@ aws-lambda-builders==1.45.0 \
     --hash=sha256:5c19a6628eecf21578cd9c521e747f4a2163c62c527cd840b11b62a10b661348 \
     --hash=sha256:a4db7766198c052900905bd7ee3b1a8b486511394cdabffed054204d43b29943
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.83.0 \
-    --hash=sha256:022246b4745cc9067f88ab2b051f49898606bcf0222e22b9da41063e5619c6f9 \
-    --hash=sha256:46025ca8894a56eacd87eb0e4f9af5c01c567c9a734b97fbba353bffd56ba5dc
+aws-sam-translator==1.84.0 \
+    --hash=sha256:a24f43e80095c79258a1f1c7a0b8169f55daf0b2bc237d5b9010b02ba86fa3bb \
+    --hash=sha256:dbfd5669b5ef4bd7bc7af4775eec2ce4db61a2c2a17d721e67b51cf6a6dd63f9
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint
@@ -60,9 +60,9 @@ botocore-stubs==1.34.32 \
     --hash=sha256:978c97b8c02b5ffa3726a5052e5715aecc52c640a75a8088b3a58453c2b054b2 \
     --hash=sha256:e5b04b8ab81e736088470b7be244de072ac2f986caf0f51b7e2087400778dc9f
     # via boto3-stubs
-certifi==2023.11.17 \
-    --hash=sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1 \
-    --hash=sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474
+certifi==2024.2.2 \
+    --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \
+    --hash=sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1
     # via requests
 cffi==1.16.0 \
     --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
@@ -589,9 +589,9 @@ python-slugify==8.0.3 \
     --hash=sha256:c71189c161e8c671f1b141034d9a56308a8a5978cd13d40446c879569212fdd1 \
     --hash=sha256:e04cba5f1c562502a1175c84a8bc23890c54cdaf23fccaaf0bf78511508cabed
     # via cookiecutter
-pytz==2023.4 \
-    --hash=sha256:31d4583c4ed539cd037956140d695e42c033a19e984bfce9964a3f7d59bc2b40 \
-    --hash=sha256:f90ef520d95e7c46951105338d918664ebfd6f1d995bd7d153127ce90efafa6a
+pytz==2024.1 \
+    --hash=sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812 \
+    --hash=sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319
     # via dateparser
 pywin32==306 \
     --hash=sha256:06d3420a5155ba65f0b72f2699b5bacf3109f36acbe8923765c22938a69dfc8d \

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.108.0"
+__version__ = "1.109.0"

samcli/cli/cli_config_file.py

@@ -406,9 +406,9 @@ def hello(name):
     def decorator_configuration_setup(f):
         configuration_setup_params = ()
         configuration_setup_attrs = {}
-        configuration_setup_attrs[
-            "help"
-        ] = "This is a hidden click option whose callback function loads configuration parameters."
+        configuration_setup_attrs["help"] = (
+            "This is a hidden click option whose callback function loads configuration parameters."
+        )
         configuration_setup_attrs["is_eager"] = True
         configuration_setup_attrs["expose_value"] = False
         configuration_setup_attrs["hidden"] = True

samcli/cli/command.py

@@ -1,6 +1,7 @@
 """
 Base classes that implement the CLI framework
 """
+
 import importlib
 import logging
 from collections import OrderedDict

samcli/cli/core/command.py

@@ -4,6 +4,7 @@
 
 Should be used by all commands for a consistent UI experience
 """
+
 from typing import Any, Dict, List, Optional
 
 from click import Command, Context, Parameter, style

samcli/cli/core/options.py

@@ -1,6 +1,7 @@
 """
 Base Command Options related Data Structures for formatting.
 """
+
 from typing import Dict, List
 
 # The ordering of the option lists matter, they are the order in which options will be displayed.

samcli/cli/formatters.py

@@ -1,6 +1,7 @@
 """
 Click Help Formatter Classes that are customized for the root command.
 """
+
 from contextlib import contextmanager
 from typing import Iterator, Optional, Sequence
 

samcli/cli/global_config.py

@@ -1,6 +1,7 @@
 """
 Provides global configuration helpers.
 """
+
 import json
 import logging
 import os
@@ -154,8 +155,7 @@ def get_value(
         value_type: Type[bool],
         is_flag: bool,
         reload_config: bool = False,
-    ) -> bool:
-        ...
+    ) -> bool: ...
 
     # Overload for case where type is specified
     @overload
@@ -166,8 +166,7 @@ def get_value(
         value_type: Type[T] = T,  # type: ignore
         is_flag: bool = False,
         reload_config: bool = False,
-    ) -> Optional[T]:
-        ...
+    ) -> Optional[T]: ...
 
     # Overload for case where type is not specified and default to object
     @overload
@@ -178,8 +177,7 @@ def get_value(
         value_type: object = object,
         is_flag: bool = False,
         reload_config: bool = False,
-    ) -> Any:
-        ...
+    ) -> Any: ...
 
     def get_value(
         self,

samcli/cli/hidden_imports.py

@@ -1,6 +1,7 @@
 """
 Keeps list of hidden/dynamic imports that is being used in SAM CLI, so that pyinstaller can include these packages
 """
+
 import pkgutil
 from types import ModuleType
 

samcli/cli/root/command_list.py

@@ -1,6 +1,7 @@
 """
 Data structure to host the root command name and short help text to speed up load time.
 """
+
 SAM_CLI_COMMANDS = {
     "init": "Initialize an AWS SAM application.",
     "validate": "Validate an AWS SAM template.",

samcli/commands/_utils/cdk_support_decorators.py

@@ -1,4 +1,5 @@
 """CDK Support"""
+
 import logging
 
 import click

samcli/commands/_utils/click_mutex.py

@@ -1,6 +1,7 @@
 """
 Module to check mutually exclusive cli parameters
 """
+
 from typing import Any, List, Mapping, Tuple, cast
 
 import click

samcli/commands/_utils/command_exception_handler.py

@@ -2,6 +2,7 @@
 Contains method decorator which can be used to convert common exceptions into click exceptions
 which will end execution gracefully
 """
+
 from functools import wraps
 from typing import Any, Callable, Dict, Optional
 

samcli/commands/_utils/constants.py

@@ -1,6 +1,7 @@
 """
 SAM CLI Default Build constants
 """
+
 import os
 
 DEFAULT_STACK_NAME = "sam-app"

samcli/commands/_utils/custom_options/replace_help_option.py

@@ -1,6 +1,7 @@
 """
 Click option for replacing help text option name.
 """
+
 import click
 
 

samcli/commands/_utils/experimental.py

@@ -1,4 +1,5 @@
 """Experimental flag"""
+
 import logging
 import sys
 from dataclasses import dataclass

samcli/commands/_utils/option_value_processor.py

@@ -1,6 +1,7 @@
 """
 Parsing utilities commonly used to process information for commands
 """
+
 import logging
 from typing import Dict, Optional, Tuple
 

samcli/commands/_utils/options.py

@@ -332,9 +332,11 @@ def template_click_option(include_build=True):
         callback=partial(get_or_default_template_file_name, include_build=include_build),
         show_default=True,
         is_eager=True,
-        help="AWS SAM template which references built artifacts for resources in the template. (if applicable)"
-        if include_build
-        else "AWS SAM template file.",
+        help=(
+            "AWS SAM template which references built artifacts for resources in the template. (if applicable)"
+            if include_build
+            else "AWS SAM template file."
+        ),
     )
 
 
@@ -767,9 +769,9 @@ def hook_name_setup(f):
     def hook_name_processer_wrapper(f):
         configuration_setup_params = ()
         configuration_setup_attrs = {}
-        configuration_setup_attrs[
-            "help"
-        ] = "This is a hidden click option whose callback function to run the provided hook package."
+        configuration_setup_attrs["help"] = (
+            "This is a hidden click option whose callback function to run the provided hook package."
+        )
         configuration_setup_attrs["is_eager"] = True
         configuration_setup_attrs["expose_value"] = False
         configuration_setup_attrs["hidden"] = True

samcli/commands/_utils/table_print.py

@@ -1,6 +1,7 @@
 """
 Utilities for table pretty printing using click
 """
+
 import shutil
 import textwrap
 from functools import wraps

samcli/commands/_utils/template.py

@@ -1,6 +1,7 @@
 """
 Utilities to manipulate template
 """
+
 import itertools
 import os
 import pathlib

samcli/commands/bootstrap/command.py

@@ -1,6 +1,7 @@
 """
 CLI command for "bootstrap", which sets up a SAM development environment
 """
+
 import click
 
 from samcli.cli.main import aws_creds_options, common_options, pass_context

samcli/commands/build/build_context.py

@@ -1,6 +1,7 @@
 """
 Context object used by build command
 """
+
 import logging
 import os
 import pathlib

samcli/commands/build/click_container.py

@@ -1,6 +1,7 @@
 """
 Module to check container based cli parameters
 """
+
 import click
 
 

samcli/commands/build/core/formatters.py

@@ -1,6 +1,7 @@
 """
 Build Command Formatter.
 """
+
 from samcli.cli.formatters import RootCommandHelpTextFormatter
 from samcli.cli.row_modifiers import BaseLineRowModifier
 from samcli.commands.build.core.options import ALL_OPTIONS

samcli/commands/build/core/options.py

@@ -1,6 +1,7 @@
 """
 Build Command Options related Datastructures for formatting.
 """
+
 from typing import Dict, List
 
 from samcli.cli.row_modifiers import RowDefinition

samcli/commands/build/utils.py

@@ -1,6 +1,7 @@
 """
 Utilities for sam build command
 """
+
 import pathlib
 from enum import Enum
 from typing import List