test(itest): enable jfr-datasource recording upload test

src/main/java/io/cryostat/discovery/CustomDiscovery.java

@@ -76,7 +76,7 @@ void onStart(@Observes StartupEvent evt) {
 
     @Transactional(rollbackOn = {JvmIdException.class})
     @POST
-    @Path("v2/targets")
+    @Path("/api/v2/targets")
     @Consumes("application/json")
     @RolesAllowed("write")
     public Response create(Target target, @RestQuery boolean dryrun) {
@@ -114,7 +114,7 @@ public Response create(Target target, @RestQuery boolean dryrun) {
             node.persist();
             realm.persist();
 
-            return Response.created(URI.create("v3/targets/" + target.id)).build();
+            return Response.created(URI.create("/api/v3/targets/" + target.id)).build();
         } catch (Exception e) {
             if (ExceptionUtils.indexOfType(e, ConstraintViolationException.class) >= 0) {
                 logger.warn("Invalid target definition", e);
@@ -127,7 +127,7 @@ public Response create(Target target, @RestQuery boolean dryrun) {
 
     @Transactional
     @POST
-    @Path("v2/targets")
+    @Path("/api/v2/targets")
     @Consumes("multipart/form-data")
     @RolesAllowed("write")
     public Response create(
@@ -141,7 +141,7 @@ public Response create(
 
     @Transactional
     @DELETE
-    @Path("v2/targets/{connectUrl}")
+    @Path("/api/v2/targets/{connectUrl}")
     @RolesAllowed("write")
     public Response delete(@RestPath URI connectUrl) throws URISyntaxException {
         Target target = Target.getTargetByConnectUrl(connectUrl);
@@ -152,7 +152,7 @@ public Response delete(@RestPath URI connectUrl) throws URISyntaxException {
 
     @Transactional
     @DELETE
-    @Path("v3/targets/{id}")
+    @Path("/api/v3/targets/{id}")
     @RolesAllowed("write")
     public Response delete(@RestPath long id) throws URISyntaxException {
         Target target = Target.find("id", id).singleResult();

src/main/java/io/cryostat/recordings/Recordings.java

@@ -682,7 +682,7 @@ public void deleteArchivedRecording(@RestPath String encodedJvmId, @RestPath Str
                         .map(c -> c.toString())
                         .orElseGet(() -> metadata.labels.computeIfAbsent("connectUrl", k -> jvmId));
         logger.infov(
-                "Archived recording from connectUrl {1} has metadata: {1}", connectUrl, metadata);
+                "Archived recording from connectUrl {0} has metadata: {1}", connectUrl, metadata);
         logger.infov(
                 "Sending S3 deletion request for {0} {1}",
                 archiveBucket, recordingHelper.archivedRecordingKey(jvmId, filename));

src/main/java/io/cryostat/rules/RuleService.java

@@ -250,8 +250,8 @@ private void scheduleArchival(Rule rule, Target target, ActiveRecording recordin
             quartz.scheduleJob(jobDetail, trigger);
         } catch (SchedulerException e) {
             logger.infov(
-                    "Failed to schedule archival job for rule {} in target {}" + rule.name,
-                    target.alias);
+                    "Failed to schedule archival job for rule {0} in target {1}",
+                    rule.name, target.alias);
             logger.error(e);
         }
         jobs.add(jobDetail.getKey());

src/main/resources/application-test.properties

@@ -5,9 +5,6 @@ cryostat.discovery.podman.enabled=true
 cryostat.discovery.docker.enabled=true
 cryostat.auth.disabled=true
 
-grafana-dashboard.url=http://grafana:3000
-grafana-datasource.url=http://jfr-datasource:8080
-
 quarkus.test.env.JAVA_OPTS_APPEND=-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false
 
 quarkus.datasource.devservices.enabled=true

src/test/java/io/cryostat/resources/GrafanaResource.java

@@ -31,7 +31,7 @@ public class GrafanaResource
     private static Map<String, String> envMap =
             Map.of(
                     "GF_INSTALL_PLUGINS", "grafana-simple-json-datasource",
-                    "GF_AUTH_ANONYMOUS_ENABLED", "tru",
+                    "GF_AUTH_ANONYMOUS_ENABLED", "true",
                     "JFR_DATASOURCE_URL", "http://jfr-datasource:8080");
 
     private Optional<String> containerNetworkId;

src/test/java/itest/CryostatTemplateIT.java

@@ -28,16 +28,16 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 @QuarkusIntegrationTest
 public class CryostatTemplateIT extends StandardSelfTest {
 
-    static File file;
+    File file;
 
-    @BeforeAll
-    static void setup() throws Exception {
+    @BeforeEach
+    void setup() throws Exception {
         String url =
                 String.format(
                         "/api/v1/targets/%s/templates/Cryostat/type/TARGET",

src/test/java/itest/CustomTargetsIT.java

@@ -21,7 +21,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -51,7 +51,7 @@
 @TestMethodOrder(OrderAnnotation.class)
 public class CustomTargetsIT extends StandardSelfTest {
 
-    private final ExecutorService worker = ForkJoinPool.commonPool();
+    private final ExecutorService worker = Executors.newCachedThreadPool();
     static final Map<String, String> NULL_RESULT = new HashMap<>();
     private String itestJvmId;
     private static StoredCredential storedCredential;

src/test/java/itest/HealthIT.java

@@ -18,6 +18,10 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
+import io.cryostat.resources.GrafanaResource;
+import io.cryostat.resources.JFRDatasourceResource;
+
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
@@ -27,21 +31,20 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @QuarkusIntegrationTest
+@QuarkusTestResource(GrafanaResource.class)
+@QuarkusTestResource(JFRDatasourceResource.class)
 public class HealthIT extends StandardSelfTest {
 
-    HttpRequest<Buffer> req;
+    JsonObject response;
 
     @BeforeEach
-    void createRequest() {
-        req = webClient.get("/health");
-    }
-
-    @Test
-    void shouldIncludeApplicationVersion() throws Exception {
+    void createRequest() throws Exception {
         CompletableFuture<JsonObject> future = new CompletableFuture<>();
+        HttpRequest<Buffer> req = webClient.get("/health");
         req.send(
                 ar -> {
                     if (ar.failed()) {
@@ -50,12 +53,40 @@ void shouldIncludeApplicationVersion() throws Exception {
                     }
                     future.complete(ar.result().bodyAsJsonObject());
                 });
-        JsonObject response = future.get(REQUEST_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+        response = future.get(REQUEST_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+    }
 
+    @Test
+    void shouldIncludeApplicationVersion() {
         Assertions.assertTrue(response.containsKey("cryostatVersion"));
         MatcherAssert.assertThat(
                 response.getString("cryostatVersion"), Matchers.not(Matchers.emptyOrNullString()));
         MatcherAssert.assertThat(
                 response.getString("cryostatVersion"), Matchers.not(Matchers.equalTo("unknown")));
+        MatcherAssert.assertThat(
+                response.getString("cryostatVersion"),
+                Matchers.matchesRegex("^v[\\d]\\.[\\d]\\.[\\d](?:-SNAPSHOT)?"));
+    }
+
+    @Disabled("TODO")
+    @Test
+    void shouldHaveAvailableDatasource() {
+        Assertions.assertTrue(response.containsKey("datasourceConfigured"));
+        MatcherAssert.assertThat(
+                response.getString("datasourceConfigured"), Matchers.equalTo("true"));
+        Assertions.assertTrue(response.containsKey("datasourceAvailable"));
+        MatcherAssert.assertThat(
+                response.getString("datasourceAvailable"), Matchers.equalTo("true"));
+    }
+
+    @Disabled("TODO")
+    @Test
+    void shouldHaveAvailableDashboard() {
+        Assertions.assertTrue(response.containsKey("dashboardConfigured"));
+        MatcherAssert.assertThat(
+                response.getString("dashboardConfigured"), Matchers.equalTo("true"));
+        Assertions.assertTrue(response.containsKey("dashboardAvailable"));
+        MatcherAssert.assertThat(
+                response.getString("dashboardAvailable"), Matchers.equalTo("true"));
     }
 }

src/test/java/itest/TargetEventsGetIT.java

@@ -31,21 +31,28 @@
 import itest.bases.StandardSelfTest;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 @QuarkusIntegrationTest
 public class TargetEventsGetIT extends StandardSelfTest {
 
-    static final String EVENT_REQ_URL =
-            String.format("/api/v1/targets/%s/events", getSelfReferenceConnectUrlEncoded());
-    static final String SEARCH_REQ_URL =
-            String.format("/api/v2/targets/%s/events", getSelfReferenceConnectUrlEncoded());
+    String eventReqUrl;
+    String searchReqUrl;
+
+    @BeforeEach
+    void setup() {
+        eventReqUrl =
+                String.format("/api/v1/targets/%s/events", getSelfReferenceConnectUrlEncoded());
+        searchReqUrl =
+                String.format("/api/v2/targets/%s/events", getSelfReferenceConnectUrlEncoded());
+    }
 
     @Test
     public void testGetTargetEventsReturnsListOfEvents() throws Exception {
         CompletableFuture<HttpResponse<Buffer>> getResponse = new CompletableFuture<>();
         webClient
-                .get(EVENT_REQ_URL)
+                .get(eventReqUrl)
                 .basicAuthentication("user", "pass")
                 .send(
                         ar -> {
@@ -67,7 +74,7 @@ public void testGetTargetEventsReturnsListOfEvents() throws Exception {
     public void testGetTargetEventsV2WithNoQueryReturnsListOfEvents() throws Exception {
         CompletableFuture<HttpResponse<Buffer>> getResponse = new CompletableFuture<>();
         webClient
-                .get(SEARCH_REQ_URL)
+                .get(searchReqUrl)
                 .basicAuthentication("user", "pass")
                 .send(
                         ar -> {
@@ -92,7 +99,7 @@ public void testGetTargetEventsV2WithNoQueryReturnsListOfEvents() throws Excepti
     public void testGetTargetEventsV2WithQueryReturnsRequestedEvents() throws Exception {
         CompletableFuture<HttpResponse<Buffer>> getResponse = new CompletableFuture<>();
         webClient
-                .get(String.format("%s?q=TargetConnectionOpened", SEARCH_REQ_URL))
+                .get(String.format("%s?q=TargetConnectionOpened", searchReqUrl))
                 .basicAuthentication("user", "pass")
                 .send(
                         ar -> {
@@ -155,7 +162,7 @@ public void testGetTargetEventsV2WithQueryReturnsRequestedEvents() throws Except
     public void testGetTargetEventsV2WithQueryReturnsEmptyListWhenNoEventsMatch() throws Exception {
         CompletableFuture<HttpResponse<Buffer>> getResponse = new CompletableFuture<>();
         webClient
-                .get(String.format("%s?q=thisEventDoesNotExist", SEARCH_REQ_URL))
+                .get(String.format("%s?q=thisEventDoesNotExist", searchReqUrl))
                 .basicAuthentication("user", "pass")
                 .send(
                         ar -> {

src/test/java/itest/UploadRecordingIT.java → src/test/java/itest/UploadRecordingTest.java

@@ -23,9 +23,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import io.cryostat.resources.GrafanaResource;
+import io.cryostat.resources.JFRDatasourceResource;
 import io.cryostat.util.HttpMimeType;
 
-import io.quarkus.test.junit.QuarkusIntegrationTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.json.JsonArray;
@@ -39,9 +42,11 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@QuarkusIntegrationTest
 @Disabled("TODO")
-public class UploadRecordingIT extends StandardSelfTest {
+@QuarkusTest
+@QuarkusTestResource(GrafanaResource.class)
+@QuarkusTestResource(JFRDatasourceResource.class)
+public class UploadRecordingTest extends StandardSelfTest {
 
     // TODO this should be a constant somewhere in the server sources
     public static final String DATASOURCE_FILENAME = "cryostat-analysis.jfr";
@@ -56,7 +61,12 @@ public static void createRecording() throws Exception {
         form.add("duration", String.valueOf(RECORDING_DURATION_SECONDS));
         form.add("events", "template=ALL");
         webClient
-                .post(String.format("/api/v1/targets/%s/recordings", getSelfReferenceConnectUrl()))
+                .post(
+                        String.format(
+                                "/api/v1/targets/%s/recordings",
+                                getSelfReferenceConnectUrlEncoded()))
+                .basicAuthentication("user", "pass")
+                .followRedirects(true)
                 .sendForm(
                         form,
                         ar -> {
@@ -79,7 +89,9 @@ public static void deleteRecording() throws Exception {
                 .delete(
                         String.format(
                                 "/api/v1/targets/%s/recordings/%s",
-                                getSelfReferenceConnectUrl(), RECORDING_NAME))
+                                getSelfReferenceConnectUrlEncoded(), RECORDING_NAME))
+                .basicAuthentication("user", "pass")
+                .followRedirects(true)
                 .send(
                         ar -> {
                             if (assertRequestStatus(ar, deleteRespFuture)) {
@@ -103,7 +115,9 @@ public void shouldLoadRecordingToDatasource() throws Exception {
                 .post(
                         String.format(
                                 "/api/v1/targets/%s/recordings/%s/upload",
-                                getSelfReferenceConnectUrl(), RECORDING_NAME))
+                                getSelfReferenceConnectUrlEncoded(), RECORDING_NAME))
+                .basicAuthentication("user", "pass")
+                .followRedirects(true)
                 .send(
                         ar -> {
                             if (assertRequestStatus(ar, uploadRespFuture)) {