Fix duplicate OPTIONS method error for paths with trailing slash

Address review feedback: use normalized_path instead of path when adding
CORS OPTIONS method. This ensures consistent behavior regardless of which
path (/datasets vs /datasets/) appears first in the template.

Fixes #3816

Author: abhishektang

samtranslator/model/api/api_generator.py

@@ -983,20 +983,20 @@ def _add_cors(self) -> None:
         # Track normalized paths to avoid duplicate OPTIONS methods for paths that differ only by trailing slash
         # API Gateway treats /path and /path/ as the same resource, so we normalize before adding CORS
         normalized_paths_processed: Set[str] = set()
-        
+
         for path in editor.iter_on_path():
             # Normalize path by removing trailing slash (except for root path "/")
             normalized_path = path.rstrip("/") if path != "/" else path
-            
+
             # Skip if we've already processed this normalized path to avoid duplicate OPTIONS methods
             if normalized_path in normalized_paths_processed:
                 continue
-            
+
             normalized_paths_processed.add(normalized_path)
-            
+
             try:
                 editor.add_cors(  # type: ignore[no-untyped-call]
-                    path,
+                    normalized_path,
                     properties.AllowOrigin,
                     properties.AllowHeaders,
                     properties.AllowMethods,

tests/model/api/test_api_generator.py

@@ -62,7 +62,7 @@ def test_add_cors_with_trailing_slash_paths(self):
                         "x-amazon-apigateway-integration": {
                             "type": "aws_proxy",
                             "httpMethod": "POST",
-                            "uri": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/func/invocations"
+                            "uri": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/func/invocations",
                         }
                     }
                 },
@@ -71,13 +71,13 @@ def test_add_cors_with_trailing_slash_paths(self):
                         "x-amazon-apigateway-integration": {
                             "type": "aws_proxy",
                             "httpMethod": "POST",
-                            "uri": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/func/invocations"
+                            "uri": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/func/invocations",
                         }
                     }
-                }
-            }
+                },
+            },
         }
-        
+
         api_generator = ApiGenerator(
             logical_id="TestApi",
             cache_cluster_enabled=None,
@@ -112,19 +112,20 @@ def test_add_cors_with_trailing_slash_paths(self):
             api_key_source_type=None,
             disable_execute_api_endpoint=None,
         )
-        
+
         # Call _add_cors which should normalize paths and avoid duplicates
         api_generator._add_cors()
-        
+
         # Check that OPTIONS method is not added to both /datasets and /datasets/
         # It should only be added once to avoid the duplicate OPTIONS error
         paths_with_options = [
-            path for path, methods in api_generator.definition_body["paths"].items()
+            path
+            for path, methods in api_generator.definition_body["paths"].items()
             if "options" in methods or "OPTIONS" in methods
         ]
-        
+
         # We should have only ONE path with OPTIONS method (the normalized one)
         # Both /datasets and /datasets/ normalize to /datasets
-        self.assertEqual(len(paths_with_options), 1, 
-                        "CORS should only add OPTIONS to one of the paths that differ by trailing slash")
-
+        self.assertEqual(
+            len(paths_with_options), 1, "CORS should only add OPTIONS to one of the paths that differ by trailing slash"
+        )