Fix nginx ingress path for capture group (#752)

dotnet · Nov 4, 2020 · 77ebc0d · 77ebc0d
1 parent 907d735
commit 77ebc0d
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Microsoft.Tye.Core/KubernetesManifestGenerator.cs b/src/Microsoft.Tye.Core/KubernetesManifestGenerator.cs
@@ -92,14 +92,21 @@ public static KubernetesIngressOutput CreateIngress(
                         //
                         // Therefore our rewrite-target is set to $2 - we want to make sure we have
                         // two capture groups.
-                        if (string.IsNullOrEmpty(ingressRule.Path) || ingressRule.Path == "/" || ingressRule.PreservePath)
+                        if (string.IsNullOrEmpty(ingressRule.Path) || ingressRule.Path == "/")
                         {
                             path.Add("path", "/()(.*)"); // () is an empty capture group.
                         }
                         else
                         {
-                            var regex = $"{ingressRule.Path.TrimEnd('/')}(/|$)(.*)";
-                            path.Add("path", regex);
+                            if (ingressRule.PreservePath)
+                            {
+                                path.Add("path", $"/()({ingressRule.Path.Trim('/')}.*)");
+                            }
+                            else
+                            {
+                                var regex = $"{ingressRule.Path.TrimEnd('/')}(/|$)(.*)";
+                                path.Add("path", regex);
+                            }
                         }
                     }
                 }