Backport/https devui+choose jar

examples/external-applications/src/test/java/io/quarkus/qe/TodoDemoIT.java

@@ -11,14 +11,35 @@
 @DisabledOnNative(reason = "This scenario is using uber-jar, so it's incompatible with Native")
 @QuarkusScenario
 public class TodoDemoIT {
-    @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/todo-demo-app.git", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests=true -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION}")
+    private static final String REPO = "https://github.com/quarkusio/todo-demo-app.git";
+    private static final String DEFAULT_ARGS = "-DskipTests=true -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION} ";
+    private static final String UBER = "-Dquarkus.package.type=uber-jar ";
+
+    @GitRepositoryQuarkusApplication(repo = REPO, mavenArgs = DEFAULT_ARGS + UBER)
     static final RestService app = new RestService();
 
+    @GitRepositoryQuarkusApplication(repo = REPO, artifact = "todo-backend-1.0-SNAPSHOT-runner.jar", mavenArgs = DEFAULT_ARGS
+            + UBER)
+    static final RestService explicit = new RestService();
+
+    private static final String NO_SUFFIX = "-Dquarkus.package.add-runner-suffix=false";
+
+    @GitRepositoryQuarkusApplication(repo = REPO, artifact = "todo-backend-1.0-SNAPSHOT.jar", mavenArgs = DEFAULT_ARGS + UBER
+            + NO_SUFFIX)
+    static final RestService unsuffixed = new RestService();
+
     @Test
     public void verify() {
-        app.given()
-                .get()
-                .then()
-                .statusCode(HttpStatus.SC_OK);
+        app.given().get().then().statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void verifyExplicitArtifact() {
+        explicit.given().get().then().statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void verifyNoSuffix() {
+        unsuffixed.given().get().then().statusCode(HttpStatus.SC_OK);
     }
-}
+}

examples/https/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java

@@ -0,0 +1,26 @@
+package io.quarkus.qe;
+
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.bootstrap.DevModeQuarkusService;
+import io.quarkus.test.scenarios.QuarkusScenario;
+import io.quarkus.test.scenarios.annotations.DisabledOnNative;
+import io.quarkus.test.services.DevModeQuarkusApplication;
+
+@QuarkusScenario
+@DisabledOnNative
+public class DevModeGreetingResourceIT {
+    @DevModeQuarkusApplication(ssl = true)
+    static DevModeQuarkusService app = new DevModeQuarkusService();
+
+    @Test
+    public void shouldOpenDevUi() {
+        app.given().get("/q/dev").then().statusCode(HttpStatus.SC_OK);
+    }
+
+    @Test
+    public void shouldOpenHttpsDevUi() {
+        app.relaxedHttps().get("/q/dev").then().statusCode(HttpStatus.SC_OK);
+    }
+}

quarkus-test-core/src/main/java/io/quarkus/test/bootstrap/RestService.java

@@ -29,6 +29,10 @@ public RequestSpecification https() {
                 .port(host.getPort());
     }
 
+    public RequestSpecification relaxedHttps() {
+        return this.https().relaxedHTTPSValidation();
+    }
+
     public WebClient mutiny() {
         return mutiny(new WebClientOptions());
     }

quarkus-test-core/src/main/java/io/quarkus/test/services/DevModeQuarkusApplication.java

@@ -20,4 +20,10 @@
      * Enable GRPC configuration. This property will map the gPRC service to a random port.
      */
     boolean grpc() default false;
+
+    /**
+     * Enable SSL configuration. This property needs `quarkus.http.ssl.certificate.key-store-file` and
+     * `quarkus.http.ssl.certificate.key-store-password` to be set.
+     */
+    boolean ssl() default false;
 }

quarkus-test-core/src/main/java/io/quarkus/test/services/GitRepositoryQuarkusApplication.java

@@ -21,6 +21,8 @@ String mavenArgs() default "-DskipTests=true -DskipITs=true "
 
     boolean devMode() default false;
 
+    String artifact() default "";
+
     /**
      * @return the properties file to use to configure the Quarkus application.
      */

quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/DevModeQuarkusApplicationManagedResourceBuilder.java

@@ -18,6 +18,7 @@ public void init(Annotation annotation) {
         initAppClasses(metadata.classes());
         setPropertiesFile(metadata.properties());
         setGrpcEnabled(metadata.grpc());
+        setSslEnabled(metadata.ssl());
     }
 
     @Override

quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/GitRepositoryQuarkusApplicationManagedResourceBuilder.java

@@ -61,6 +61,7 @@ public void init(Annotation annotation) {
         contextDir = metadata.contextDir();
         mavenArgs = metadata.mavenArgs();
         devMode = metadata.devMode();
+        setArtifactSuffix(metadata.artifact());
         initAppClasses(new Class[0]);
         setPropertiesFile(metadata.properties());
     }

quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/ProdQuarkusApplicationManagedResourceBuilder.java

@@ -40,12 +40,21 @@ public class ProdQuarkusApplicationManagedResourceBuilder extends ArtifactQuarku
 
     private Path artifact;
     private QuarkusManagedResource managedResource;
+    private String artifactSuffix;
 
     @Override
     protected Path getArtifact() {
         return artifact;
     }
 
+    protected void setArtifactSuffix(String suffix) {
+        if (suffix == null || suffix.isEmpty() || suffix.isBlank()) {
+            this.artifactSuffix = null;
+        } else {
+            this.artifactSuffix = suffix;
+        }
+    }
+
     @Override
     public void init(Annotation annotation) {
         QuarkusApplication metadata = (QuarkusApplication) annotation;
@@ -70,7 +79,7 @@ public void build() {
         managedResource.onPreBuild();
         copyResourcesToAppFolder();
         if (managedResource.needsBuildArtifact()) {
-            tryToReuseOrBuildArtifact();
+            this.artifact = tryToReuseOrBuildArtifact();
         }
 
         managedResource.onPostBuild();
@@ -90,27 +99,34 @@ protected Path getTargetFolderForLocalArtifacts() {
         return Paths.get(TARGET);
     }
 
-    private void tryToReuseOrBuildArtifact() {
+    private Path tryToReuseOrBuildArtifact() {
         Optional<String> artifactLocation = Optional.empty();
+        final Path targetFolder = getTargetFolderForLocalArtifacts();
+        if (artifactSuffix != null) {
+            return findTargetFile(targetFolder, artifactSuffix)
+                    .map(Path::of)
+                    .orElseThrow(() -> new IllegalStateException(String.format("Folder %s doesn't contain '%s'",
+                            targetFolder,
+                            artifactSuffix)));
+        }
         if (!containsBuildProperties() && !requiresCustomBuild()) {
             if (QuarkusProperties.isNativePackageType(getContext())) {
                 String nativeRunnerExpectedLocation = NATIVE_RUNNER;
                 if (OS.WINDOWS.isCurrentOs()) {
                     nativeRunnerExpectedLocation += EXE;
                 }
 
-                artifactLocation = findTargetFile(getTargetFolderForLocalArtifacts(), nativeRunnerExpectedLocation);
-
+                artifactLocation = findTargetFile(targetFolder, nativeRunnerExpectedLocation);
             } else {
-                artifactLocation = findTargetFile(getTargetFolderForLocalArtifacts(), JVM_RUNNER)
-                        .or(() -> findTargetFile(getTargetFolderForLocalArtifacts().resolve(QUARKUS_APP), QUARKUS_RUN));
+                artifactLocation = findTargetFile(targetFolder, JVM_RUNNER)
+                        .or(() -> findTargetFile(targetFolder.resolve(QUARKUS_APP), QUARKUS_RUN));
             }
         }
 
         if (artifactLocation.isEmpty()) {
-            this.artifact = buildArtifact();
+            return buildArtifact();
         } else {
-            this.artifact = Path.of(artifactLocation.get());
+            return Path.of(artifactLocation.get());
         }
     }