fix: gradle image build should use the Quarkus generator for Quarkus …

…projects eclipse-jkube#1047 Signed-off-by: Sun Seng David TAN <sutan@redhat.com>
sunix · Dec 6, 2021 · e30a7d1 · e30a7d1
1 parent c5a570c
commit e30a7d1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
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
@@ -142,7 +142,8 @@ public static String resolveQuarkusLivenessPath(JavaProject javaProject) {
 
   public static boolean hasQuarkusPlugin(JavaProject javaProject) {
     return JKubeProjectUtil.hasPlugin(javaProject, QUARKUS_GROUP_ID, "quarkus-maven-plugin") ||
-           JKubeProjectUtil.hasPlugin(javaProject, QUARKUS_PLATFORM_GROUP_ID, "quarkus-maven-plugin");
+           JKubeProjectUtil.hasPlugin(javaProject, QUARKUS_PLATFORM_GROUP_ID, "quarkus-maven-plugin") ||
+           JKubeProjectUtil.hasPlugin(javaProject, QUARKUS_GROUP_ID, "io.quarkus.gradle.plugin");
   }
 
   /**

diff --git a/...e-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorTest.java b/...e-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorTest.java
@@ -135,6 +135,23 @@ public void isApplicable_withQuarkusPlatformGroupIdPlugin_shouldReturnTrue() {
     assertThat(result).isTrue();
   }
 
+  @Test
+  public void isApplicable_withQuarkusGradlePlugin_shouldReturnTrue() {
+    // Given
+    // @formatter:off
+    new Expectations() {{
+      project.getPlugins(); result = Collections.singletonList(Plugin.builder()
+        .groupId("io.quarkus")
+        .artifactId("io.quarkus.gradle.plugin")
+        .build());
+    }};
+    // @formatter:on
+    // When
+    final boolean result = new QuarkusGenerator(ctx).isApplicable(new ArrayList<>());
+    // Then
+    assertThat(result).isTrue();
+  }
+
   @Test
   public void customize_inOpenShift_shouldReturnS2iFrom() {
     // Given