Release 1.88.0 (to main) (#3588)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Xia Zhao <xazhao@amazon.com>
Co-authored-by: aws-sam-cli-bot <46753707+aws-sam-cli-bot@users.noreply.github.com>

Author: 7 people

bin/_file_formatter.py

@@ -1,4 +1,5 @@
 """Formatter base class for JSONFormatter and YamlFormatter."""
+
 import argparse
 import os
 import sys

bin/public_interface.py

@@ -101,13 +101,15 @@ def _print(signature: Dict[str, inspect.Signature], variables: Set[str]) -> None
     result: Dict[str, Any] = {"routines": {}, "variables": sorted(variables)}
     for key, value in signature.items():
         result["routines"][key] = [
-            {
-                "name": parameter.name,
-                "kind": parameter.kind.name,
-                "default": parameter.default,
-            }
-            if parameter.default != inspect.Parameter.empty
-            else {"name": parameter.name, "kind": parameter.kind.name}
+            (
+                {
+                    "name": parameter.name,
+                    "kind": parameter.kind.name,
+                    "default": parameter.default,
+                }
+                if parameter.default != inspect.Parameter.empty
+                else {"name": parameter.name, "kind": parameter.kind.name}
+            )
             for parameter in value.parameters.values()
         ]
     print(json.dumps(result, indent=2, sort_keys=True))

integration/combination/test_function_with_all_event_types.py

@@ -1,13 +1,13 @@
 from unittest.case import skipIf
 
-from integration.config.service_names import IOT, SCHEDULE_EVENT
+from integration.config.service_names import IOT, LOGS, SCHEDULE_EVENT
 from integration.helpers.base_test import BaseTest
 from integration.helpers.resource import current_region_does_not_support, generate_suffix
 
 
 @skipIf(
-    current_region_does_not_support([IOT, SCHEDULE_EVENT]),
-    "IoT, ScheduleEvent is not supported in this testing region",
+    current_region_does_not_support([IOT, SCHEDULE_EVENT, LOGS]),
+    "IoT, ScheduleEvent or a Logs resource is not supported in this testing region",
 )
 class TestFunctionWithAllEventTypes(BaseTest):
     def test_function_with_all_event_types(self):

integration/combination/test_function_with_cloudwatch_log.py

@@ -1,6 +1,14 @@
+from unittest.case import skipIf
+
+from integration.config.service_names import LOGS
 from integration.helpers.base_test import BaseTest
+from integration.helpers.resource import current_region_does_not_support
 
 
+@skipIf(
+    current_region_does_not_support([LOGS]),
+    "A Logs resource that is a part of this test is not supported in this testing region",
+)
 class TestFunctionWithCloudWatchLog(BaseTest):
     def test_function_with_cloudwatch_log(self):
         self.create_and_verify_stack("combination/function_with_cloudwatch_log")

integration/config/service_names.py

@@ -35,3 +35,4 @@
 API_KEY = "ApiKey"
 APP_SYNC = "AppSync"
 SNS_FILTER_POLICY_SCOPE = "SnsFilterPolicyScope"
+LOGS = "Logs"

integration/helpers/deployer/deployer.py

@@ -208,9 +208,9 @@ def describe_changeset(self, change_set_id, stack_name, **kwargs):
                     {
                         "LogicalResourceId": resource_props.get("LogicalResourceId"),
                         "ResourceType": resource_props.get("ResourceType"),
-                        "Replacement": "N/A"
-                        if resource_props.get("Replacement") is None
-                        else resource_props.get("Replacement"),
+                        "Replacement": (
+                            "N/A" if resource_props.get("Replacement") is None else resource_props.get("Replacement")
+                        ),
                     }
                 )
 

integration/helpers/deployer/utils/colors.py

@@ -2,6 +2,7 @@
 Wrapper to generated colored messages for printing in Terminal
 This was ported over from the sam-cli repo
 """
+
 from typing import Dict, Literal
 
 SupportedColor = Literal["red", "green", "yellow"]

integration/helpers/deployer/utils/retry.py

@@ -1,6 +1,7 @@
 """
 Retry decorator to retry decorated function based on Exception with exponential backoff and number of attempts built-in.
 """
+
 import math
 import random
 import time

integration/helpers/deployer/utils/table_print.py

@@ -2,6 +2,7 @@
 Utilities for table pretty printing
 This was ported over from the sam-cli repo
 """
+
 import shutil
 import textwrap
 from functools import wraps

integration/helpers/s3_uploader.py

@@ -1,6 +1,7 @@
 """
 Client for uploading files to s3
 """
+
 import logging
 from typing import Any