From 19eb577fed8dcae4fd43f4a2611454fe78b49744 Mon Sep 17 00:00:00 2001 From: Lukas Krejci Date: Tue, 27 Aug 2019 13:37:54 +0200 Subject: [PATCH] Fixes #14336. Don't blow up on missing path transform configuration. Signed-off-by: Lukas Krejci --- .../server/external/IngressPathTransformInverter.java | 3 +++ .../server/external/IngressPathTransformInverterTest.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverter.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverter.java index 527c65449da..4a19f4b5fc8 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverter.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverter.java @@ -52,6 +52,9 @@ public IngressPathTransformInverter( * @return the regex that essentially reverts the effect of the path transformation */ private static Pattern extractPathFromFmt(String pathTransformFmt) { + if (pathTransformFmt == null) { + return Pattern.compile("^(.*)$"); + } Matcher m = PATH_FORMAT_DECONSTRUCTION_REGEX.matcher(pathTransformFmt); if (m.matches() && m.groupCount() == 2) { String prefix = Pattern.quote(m.group(1)); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverterTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverterTest.java index f52c5aa442c..544b52a4a40 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverterTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverterTest.java @@ -33,7 +33,8 @@ public static Object[][] transformationTestCases() { {"%ssuffix", "pathsuffix", "path"}, {"prefix%s", "prefixpath", "path"}, {"prefix%ssuffix", "prefixpathsuffix", "path"}, - {"prefix%s", "non-matching", "non-matching"} + {"prefix%s", "non-matching", "non-matching"}, + {null, "some path", "some path"} }; } }