Merge pull request #2812 from aws/main-copy

chore: Merge branch "main" into "develop" to apply the patch and version bump

Author: aahung

.cfnlintrc.yaml

@@ -108,7 +108,7 @@ ignore_templates:
   - tests/translator/output/**/s3_intrinsics.json
   - tests/translator/output/**/schema_validation_1.json
   - tests/translator/output/**/self_managed_kafka_with_intrinsics.json
-  - tests/translator/output/**/sqs_with_scaling_config.json # TODO: remove once SQS scaling config is available
+  - tests/translator/output/**/sqs_with_scaling_config.json  # Invalid Property Resources/SQSFunctionMySqsQueue/Properties/ScalingConfig
   - tests/translator/output/**/state_machine_with_condition.json
   - tests/translator/output/**/state_machine_with_condition_and_events.json
   - tests/translator/output/**/state_machine_with_eb_dlq_target_id.json

samtranslator/__init__.py

@@ -1 +1 @@
-__version__ = "1.58.0"
+__version__ = "1.58.1"

samtranslator/model/eventsources/pull.py

@@ -54,7 +54,7 @@ class PullEventSource(ResourceMacro, metaclass=ABCMeta):
         "KafkaBootstrapServers": PropertyType(False, is_type(list)),
         "FilterCriteria": PropertyType(False, IS_DICT),
         "ConsumerGroupId": PropertyType(False, IS_STR),
-        "ScalingConfig": PropertyType(False, IS_STR),
+        "ScalingConfig": PropertyType(False, IS_DICT),
     }
 
     BatchSize: Optional[Intrinsicable[int]]

samtranslator/model/types.py

@@ -135,3 +135,15 @@ def validate(value: Any, should_raise: bool = False) -> bool:
         return True
 
     return validate
+
+
+def is_str() -> Validator:
+    """
+    For compatibility reason, we need this `is_str()` as it
+    is consumed by old versions of AWS SAM CLI (<1.71.0).
+
+    Related PRs/commits:
+    https://github.com/aws/serverless-application-model/pull/2752
+    https://github.com/aws/aws-sam-cli/commit/d18f57c5f39273a04fb582f90e6c5817a4651912
+    """
+    return IS_STR