quakrus test

eclipse-jkube · Jul 17, 2023 · e8140ce · e8140ce
1 parent b016b35
commit e8140ce
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java
@@ -63,14 +63,14 @@ public class QuarkusUtils {
 
   private QuarkusUtils() {}
 
-  public static String extractPort(JavaProject javaProject, Properties properties, String defaultValue) {
-    final Optional<String> activeProfile = getActiveProfile(javaProject);
-    if (activeProfile.isPresent()) {
-      final String profilePort = properties.getProperty(String.format("%%%s.%s", activeProfile.get(), QUARKUS_HTTP_PORT));
-      if (StringUtils.isNotBlank(profilePort)) {
-        return profilePort;
-      }
-    }
+  public static String extractPort(Properties properties, String defaultValue) {
+    // final Optional<String> activeProfile = getActiveProfile(javaProject);
+    // if (activeProfile.isPresent()) {
+    //   final String profilePort = properties.getProperty(String.format("%%%s.%s", activeProfile.get(), QUARKUS_HTTP_PORT));
+    //   if (StringUtils.isNotBlank(profilePort)) {
+    //     return profilePort;
+    //   }
+    // }
     return properties.getProperty(QUARKUS_HTTP_PORT, defaultValue);
   }
 

diff --git a/...-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java b/...-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java
@@ -29,6 +29,8 @@
 
 import static org.eclipse.jkube.kit.common.Configs.asInteger;
 import static org.eclipse.jkube.quarkus.QuarkusUtils.QUARKUS_GROUP_ID;
+import static org.eclipse.jkube.quarkus.QuarkusUtils.extractPort;
+import static org.eclipse.jkube.quarkus.QuarkusUtils.getQuarkusConfiguration;
 import static org.eclipse.jkube.quarkus.QuarkusUtils.concatPath;
 import static org.eclipse.jkube.quarkus.QuarkusUtils.isStartupEndpointSupported;
 import static org.eclipse.jkube.quarkus.QuarkusUtils.resolveCompleteQuarkusHealthRootPath;
@@ -87,7 +89,8 @@ private Probe discoverQuarkusHealthCheck(int initialDelay, Function<JavaProject,
         }
         return new ProbeBuilder()
             .withNewHttpGet()
-              .withNewPort(asInteger(getConfig(Config.PORT)))
+            .withNewPort(asInteger(extractPort(getQuarkusConfiguration(getContext().getProject()),getConfig(Config.PORT))))
+              //.withNewPort(asInteger(getConfig(Config.PORT)))
               .withPath(resolveHealthPath(pathResolver.apply(getContext().getProject())))
               .withScheme(getConfig(Config.SCHEME))
             .endHttpGet()

diff --git a/...jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/generator/QuarkusGenerator.java b/...jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/generator/QuarkusGenerator.java
@@ -68,7 +68,7 @@ public boolean isApplicable(List<ImageConfiguration> configs) {
 
   @Override
   protected String getDefaultWebPort() {
-    return extractPort(getProject(), getQuarkusConfiguration(getProject()), super.getDefaultWebPort());
+    return extractPort(getQuarkusConfiguration(getProject()), super.getDefaultWebPort());
   }
 
   @Override

diff --git a/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/QuarkusUtilsTest.java b/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/QuarkusUtilsTest.java
@@ -56,7 +56,7 @@ void setUp() throws IOException {
   @Test
   void extractPort_noProfileAndNoPort_shouldReturnDefault() {
     // When
-    final String result = extractPort(javaProject, new Properties(), "80");
+    final String result = extractPort(new Properties(), "80");
     // Then
     assertThat(result).isEqualTo("80");
   }
@@ -67,7 +67,7 @@ void extractPort_noProfileAndPort_shouldReturnPort() {
     final Properties properties = new Properties();
     properties.put("quarkus.http.port", "1337");
     // When
-    final String result = extractPort(javaProject, properties, "80");
+    final String result = extractPort(properties, "80");
     // Then
     assertThat(result).isEqualTo("1337");
   }
@@ -79,7 +79,7 @@ void extractPort_inactiveProfileAndPort_shouldReturnPort() {
     properties.put("quarkus.http.port", "1337");
     properties.put("%dev.quarkus.http.port", "31337");
     // When
-    final String result = extractPort(javaProject, properties, "80");
+    final String result = extractPort(properties, "80");
     // Then
     assertThat(result).isEqualTo("1337");
   }
@@ -92,7 +92,7 @@ void extractPort_activeProfileAndPort_shouldReturnProfilePort() {
     properties.put("%dev.quarkus.http.port", "31337");
     javaProject.getProperties().put("quarkus.profile", "dev");
     // When
-    final String result = extractPort(javaProject, properties, "80");
+    final String result = extractPort(properties, "80");
     // Then
     assertThat(result).isEqualTo("31337");
   }

diff --git a/quickstarts/maven/quarkus/src/main/resources/application.properties b/quickstarts/maven/quarkus/src/main/resources/application.properties
@@ -12,4 +12,5 @@
 #   Red Hat, Inc. - initial API and implementation
 #
 
-%dev.quarkus.http.port=9080
+%dev.quarkus.http.port=9080
+quarkus.http.port=9080