From 87a8dcf2a46eaf1e6c62cb31d4929eb105dd8057 Mon Sep 17 00:00:00 2001
From: Phil Asmar <phil.asmar@gmail.com>
Date: Thu, 19 Dec 2024 18:03:43 -0500
Subject: [PATCH] fix: greedy variable can be any value

---
 .../Services/ApiGatewayRouteConfigService.cs        | 13 +++++++++----
 .../Services/ApiGatewayRouteConfigServiceTests.cs   |  8 +++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/ApiGatewayRouteConfigService.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/ApiGatewayRouteConfigService.cs
index 66f8df4bd..c0020a2c7 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/ApiGatewayRouteConfigService.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/ApiGatewayRouteConfigService.cs
@@ -142,15 +142,20 @@ private bool IsRouteConfigValid(ApiGatewayRouteConfig routeConfig)
             return false;
         }
 
-        var occurrences = routeConfig.Path.Split("{proxy+}").Length - 1;
-        if (occurrences > 1)
+        var occurrences = routeConfig.Path
+            .Split('/')
+            .Where(
+                x => x.StartsWith("{") &&
+                     x.EndsWith("+}"))
+            .ToList();
+        if (occurrences.Count > 1)
         {
             _logger.LogError("The route config {Method} {Path} cannot have multiple greedy variables {{proxy+}}.",
                 routeConfig.HttpMethod, routeConfig.Path);
             return false;
         }
 
-        if (occurrences == 1 && !routeConfig.Path.EndsWith("/{proxy+}"))
+        if (occurrences.Count == 1 && !routeConfig.Path.EndsWith($"/{occurrences.Last()}"))
         {
             _logger.LogError("The route config {Method} {Path} uses a greedy variable {{proxy+}} but does not end with it.",
                 routeConfig.HttpMethod, routeConfig.Path);
@@ -412,7 +417,7 @@ private bool IsVariableSegment(string segment)
     /// <returns><c>true</c> if the segment is a greedy variable segment; <c>false</c> otherwise.</returns>
     private bool IsGreedyVariable(string segment)
     {
-        return segment.Equals("{proxy+}", StringComparison.InvariantCultureIgnoreCase);
+        return segment.StartsWith("{") && segment.EndsWith("+}");
     }
 
     /// <summary>
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Services/ApiGatewayRouteConfigServiceTests.cs b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Services/ApiGatewayRouteConfigServiceTests.cs
index 633b04b28..295d1bd38 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Services/ApiGatewayRouteConfigServiceTests.cs
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Services/ApiGatewayRouteConfigServiceTests.cs
@@ -159,8 +159,10 @@ public void Constructor_LoadsAndParsesListOfConfigs()
         Assert.Equal("Function2", result2.LambdaResourceName);
     }
 
-    [Fact]
-    public void CatchAllRouteConfig()
+    [Theory]
+    [InlineData("proxy")]
+    [InlineData("anyvalue")]
+    public void CatchAllRouteConfig(string variableName)
     {
         // Arange
         var routeConfigs = new List<ApiGatewayRouteConfig>
@@ -169,7 +171,7 @@ public void CatchAllRouteConfig()
             {
                 LambdaResourceName = "F1",
                 HttpMethod = "ANY",
-                Path = "/{proxy+}"
+                Path = $"/{{{variableName}+}}"
             }
         };