Make parseVCSUri less brittle

Fixes quarkusio#40369 (cherry picked from commit a80a37e)
gsmet · May 14, 2024 · d54eb0d · d54eb0d
1 parent 1bd39d1
commit d54eb0d
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/...lla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java b/...lla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java
@@ -1194,9 +1194,19 @@ private static List<PolicyRule> toPolicyRulesList(Map<String, PolicyRuleConfig>
     }
 
     private static String parseVCSUri(VCSUriConfig config, ScmInfo scm) {
-        if (config.enabled) {
-            return config.override.orElseGet(() -> scm != null ? Git.sanitizeRemoteUrl(scm.getRemote().get("origin")) : null);
+        if (!config.enabled) {
+            return null;
         }
-        return null;
+        if (config.override.isPresent()) {
+            return config.override.get();
+        }
+        if (scm == null) {
+            return null;
+        }
+        String originRemote = scm.getRemote().get("origin");
+        if (originRemote == null || originRemote.isBlank()) {
+            return null;
+        }
+        return Git.sanitizeRemoteUrl(originRemote);
     }
 }