Merge pull request #3543 from aws/release-v1.85.0

Release 1.85.0 (to main)
aws · Feb 15, 2024 · cf74322 · cf74322
2 parents e8d1da7 + d7af889
commit cf74322
Show file tree

Hide file tree

Showing 7 changed files with 860 additions and 328 deletions.
diff --git a/samtranslator/__init__.py b/samtranslator/__init__.py
@@ -1 +1 @@
-__version__ = "1.84.0"
+__version__ = "1.85.0"
diff --git a/samtranslator/plugins/api/implicit_http_api_plugin.py b/samtranslator/plugins/api/implicit_http_api_plugin.py
@@ -124,6 +124,7 @@ def _add_route_settings_to_api(
 
         # Handle Resource-level conditions if necessary
         api_route_settings = resource.properties.get("RouteSettings", {})
+        sam_expect(api_route_settings, api_id, "RouteSettings").to_be_a_map()
         event_route_settings = event_properties.get("RouteSettings", {})
         if condition:
             event_route_settings = make_conditional(condition, event_properties.get("RouteSettings", {}))

diff --git a/samtranslator/schema/schema.json b/samtranslator/schema/schema.json
diff --git a/schema_source/cloudformation-docs.json b/schema_source/cloudformation-docs.json
diff --git a/schema_source/cloudformation.schema.json b/schema_source/cloudformation.schema.json
diff --git a/tests/translator/input/error_http_api_list_route_settings.yaml b/tests/translator/input/error_http_api_list_route_settings.yaml
@@ -0,0 +1,9 @@
+Resources:
+  ChatApi:
+    Type: AWS::Serverless::HttpApi
+    Properties:
+      Name: !Ref 'ChatApiName'
+      RouteSettings:
+      - RouteKey: !Sub 'ANY /${ChatApiName}'
+        ThrottlingBurstLimit: 100
+        ThrottlingRateLimit: 100
diff --git a/tests/translator/output/error_http_api_list_route_settings.json b/tests/translator/output/error_http_api_list_route_settings.json
@@ -0,0 +1,14 @@
+{
+  "_autoGeneratedBreakdownErrorMessage": [
+    "Invalid Serverless Application Specification document. ",
+    "Number of errors found: 1. ",
+    "Resource with id [ChatApi] is invalid. ",
+    "Property 'RouteSettings' should be a map."
+  ],
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [ChatApi] is invalid. Property 'RouteSettings' should be a map.",
+  "errors": [
+    {
+      "errorMessage": "Resource with id [ChatApi] is invalid. Property 'RouteSettings' should be a map."
+    }
+  ]
+}