From 7853c28136e9403396278d1082b55ac6b0fe62fd Mon Sep 17 00:00:00 2001
From: Ming Wang <miwan@redhat.com>
Date: Fri, 1 Sep 2023 15:18:46 -0400
Subject: [PATCH 01/44] feat(eventtemplates): custom event templates in S3

---
 .../io/cryostat/events/EventTemplates.java    | 177 +++++++++++++++++-
 src/main/resources/application.properties     |   1 +
 src/test/java/itest/TemplatePostDeleteIT.java |   8 +-
 3 files changed, 183 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 61d80cee0..ab3280c2d 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -15,23 +15,53 @@
  */
 package io.cryostat.events;
 
+import java.io.IOException;
 import java.net.URI;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.JFCGrammar;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLAttributeInstance;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLModel;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLTagInstance;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLValidationResult;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.model.EventConfiguration;
+
+import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
+import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
 import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
 import io.cryostat.targets.TargetConnectionManager;
-
+import io.cryostat.util.HttpStatusCodeIdentifier;
+import io.quarkus.runtime.StartupEvent;
+import io.smallrye.common.annotation.Blocking;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.Vertx;
 import jakarta.annotation.security.RolesAllowed;
+import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Response;
+import org.apache.http.entity.ContentType;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.RestForm;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
+
 import org.jboss.resteasy.reactive.RestPath;
 import org.jboss.resteasy.reactive.RestResponse;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 
 @Path("")
 public class EventTemplates {
@@ -45,7 +75,37 @@ public class EventTemplates {
                     "Cryostat",
                     TemplateType.TARGET);
 
+    @Inject Vertx vertx;
     @Inject TargetConnectionManager connectionManager;
+    @Inject S3Client storage;
+    @Inject Logger logger;
+
+    @ConfigProperty(name = "storage.buckets.event-templates.name")
+    String eventTemplatesBucket;
+
+    void onStart(@Observes StartupEvent evt) {
+        boolean exists = false;
+        try {
+            exists =
+                    HttpStatusCodeIdentifier.isSuccessCode(
+                            storage.headBucket(
+                                            HeadBucketRequest.builder()
+                                                    .bucket(eventTemplatesBucket)
+                                                    .build())
+                                    .sdkHttpResponse()
+                                    .statusCode());
+        } catch (Exception e) {
+            logger.info(e);
+        }
+        if (!exists) {
+            try {
+                storage.createBucket(
+                        CreateBucketRequest.builder().bucket(eventTemplatesBucket).build());
+            } catch (Exception e) {
+                logger.error(e);
+            }
+        }
+    }
 
     @GET
     @Path("/api/v1/targets/{connectUrl}/templates")
@@ -58,6 +118,32 @@ public Response listTemplatesV1(@RestPath URI connectUrl) throws Exception {
                 .build();
     }
 
+    @POST
+    @Path("/api/v1/templates")
+    @RolesAllowed("write")
+    public Uni<Void> postTemplatesV1(@RestForm("template") FileUpload body) throws Exception {
+        CompletableFuture<Void> cf = new CompletableFuture<>();
+        var path = body.filePath();
+        vertx.fileSystem()
+                .readFile(path.toString())
+                .onComplete(
+                        ar -> {
+                            try {
+                                addTemplate(ar.result().toString());
+                                cf.complete(null);
+                            } catch (Exception e) {
+                                logger.error(e);
+                                cf.completeExceptionally(e);
+                            }
+                        })
+                .onFailure(
+                        ar -> {
+                            logger.error(ar.getCause());
+                            cf.completeExceptionally(ar.getCause());
+                        });
+        return Uni.createFrom().future(cf);
+    }
+
     @GET
     @Path("/api/v1/targets/{connectUrl}/templates/{templateName}/type/{templateType}")
     @RolesAllowed("read")
@@ -106,4 +192,93 @@ public String getTargetTemplate(
                                 .orElseThrow(NotFoundException::new)
                                 .toString());
     }
+
+    // static class S3TemplateService implements TemplateService {
+    //     S3Client s3;
+
+    //     @Override
+    //     public Optional<IConstrainedMap<EventOptionID>> getEvents(String arg0, TemplateType arg1)
+    //             throws FlightRecorderException {
+    //         return Optional.empty();
+    //     }
+
+    //     @Override
+    //     public List<Template> getTemplates() throws FlightRecorderException {
+    //         var objects = s3.listObjectsV2();
+    //         var templates = convertObjects(objects);
+    //         return templates;
+    //     }
+
+    //     @Override
+    //     public Optional<Document> getXml(String arg0, TemplateType arg1)
+    //             throws FlightRecorderException {
+    //         return Optional.empty();
+    //     }
+    // }
+
+    @Blocking
+    public Template addTemplate(String templateText)
+            throws InvalidXmlException, InvalidEventTemplateException, IOException {
+        try {
+            XMLModel model = EventConfiguration.createModel(templateText);
+            model.checkErrors();
+
+            for (XMLValidationResult result : model.getResults()) {
+                if (result.isError()) {
+                    // throw new InvalidEventTemplateException(result.getText());
+                    throw new IllegalArgumentException(result.getText());
+                }
+            }
+
+            XMLTagInstance configuration = model.getRoot();
+            XMLAttributeInstance labelAttr = null;
+            for (XMLAttributeInstance attr : configuration.getAttributeInstances()) {
+                if (attr.getAttribute().getName().equals("label")) {
+                    labelAttr = attr;
+                    break;
+                }
+            }
+
+            if (labelAttr == null) {
+                // throw new InvalidEventTemplateException(
+                //         "Template has no configuration label attribute");
+                throw new IllegalArgumentException("Template has no configuration label attribute");
+            }
+
+            String templateName = labelAttr.getExplicitValue();
+            templateName = templateName.replaceAll("[\\W]+", "_");
+
+            XMLTagInstance root = model.getRoot();
+            root.setValue(JFCGrammar.ATTRIBUTE_LABEL_MANDATORY, templateName);
+
+            String key = templateName;
+            storage.putObject(
+                    PutObjectRequest.builder()
+                            .bucket(eventTemplatesBucket)
+                            .key(key)
+                            .contentType(ContentType.APPLICATION_XML.getMimeType())
+                            .build(),
+                    RequestBody.fromString(model.toString()));
+
+            return new Template(
+                    templateName,
+                    getAttributeValue(root, "description"),
+                    getAttributeValue(root, "provider"),
+                    TemplateType.CUSTOM);
+        } catch (IOException ioe) {
+            // throw new InvalidXmlException("Unable to parse XML stream", ioe);
+            throw new IllegalArgumentException("Unable to parse XML stream", ioe);
+        } catch (ParseException | IllegalArgumentException e) {
+            // throw new InvalidEventTemplateException("Invalid XML", e);
+            throw new IllegalArgumentException("Invalid XML", e);
+        }
+    }
+
+    protected String getAttributeValue(XMLTagInstance node, String valueKey) {
+        return node.getAttributeInstances().stream()
+                .filter(i -> Objects.equals(valueKey, i.getAttribute().getName()))
+                .map(i -> i.getValue())
+                .findFirst()
+                .get();
+    }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6381edd25..61cd7f61f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -58,6 +58,7 @@ storage.presigned-downloads.enabled=false
 storage.transient-archives.enabled=false
 storage.transient-archives.ttl=60s
 storage.buckets.archives.name=archivedrecordings
+storage.buckets.event-templates.name=eventtemplates
 storage.buckets.archives.expiration-label=expiration
 
 quarkus.quinoa.build-dir=dist
diff --git a/src/test/java/itest/TemplatePostDeleteIT.java b/src/test/java/itest/TemplatePostDeleteIT.java
index b7cb509dd..df35d3c6b 100644
--- a/src/test/java/itest/TemplatePostDeleteIT.java
+++ b/src/test/java/itest/TemplatePostDeleteIT.java
@@ -28,11 +28,10 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @QuarkusIntegrationTest
-@Disabled("TODO")
+// @Disabled("TODO")
 public class TemplatePostDeleteIT extends StandardSelfTest {
     static final String INVALID_TEMPLATE_FILE_NAME = "invalidTemplate.xml";
     static final String SANITIZE_TEMPLATE_FILE_NAME = "TemplateToSanitize.jfc";
@@ -57,6 +56,7 @@ public void shouldThrowIfTemplateUploadNameInvalid() throws Exception {
 
         webClient
                 .post(REQ_URL)
+                .basicAuthentication("user", "pass")
                 .sendMultipartForm(
                         form,
                         ar -> {
@@ -86,6 +86,7 @@ public void shouldThrowWhenPostingInvalidTemplate() throws Exception {
 
         webClient
                 .post(REQ_URL)
+                .basicAuthentication("user", "pass")
                 .sendMultipartForm(
                         form,
                         ar -> {
@@ -105,6 +106,7 @@ public void testDeleteRecordingThrowsOnNonExistentTemplate() throws Exception {
 
         webClient
                 .delete(String.format("%s/%s", REQ_URL, INVALID_TEMPLATE_FILE_NAME))
+                .basicAuthentication("user", "pass")
                 .send(
                         ar -> {
                             assertRequestStatus(ar, response);
@@ -142,6 +144,7 @@ public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
             CompletableFuture<JsonArray> getResponse = new CompletableFuture<>();
             webClient
                     .get("/api/v1/targets/localhost:0/templates")
+                    .basicAuthentication("user", "pass")
                     .send(
                             ar -> {
                                 assertRequestStatus(ar, getResponse);
@@ -160,6 +163,7 @@ public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
             CompletableFuture<Integer> deleteResponse = new CompletableFuture<>();
             webClient
                     .delete(REQ_URL + "/Template_To_Sanitize")
+                    .basicAuthentication("user", "pass")
                     .send(
                             ar -> {
                                 assertRequestStatus(ar, deleteResponse);

From 2e5608b1474be1dfebd6f52830c33f02dd027eb1 Mon Sep 17 00:00:00 2001
From: Ming Wang <miwan@redhat.com>
Date: Wed, 6 Sep 2023 10:55:03 -0400
Subject: [PATCH 02/44] tmp

---
 .../java/io/cryostat/CustomEventTemplate.java | 26 +++++++++++++++++++
 src/test/java/io/cryostat/HealthTest.java     |  1 -
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/cryostat/CustomEventTemplate.java

diff --git a/src/test/java/io/cryostat/CustomEventTemplate.java b/src/test/java/io/cryostat/CustomEventTemplate.java
new file mode 100644
index 000000000..a24fa3127
--- /dev/null
+++ b/src/test/java/io/cryostat/CustomEventTemplate.java
@@ -0,0 +1,26 @@
+package io.cryostat;
+
+import static io.cryostat.TestUtils.givenBasicAuth;
+
+import org.eclipse.microprofile.openapi.models.media.XML;
+import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+public class CustomEventTemplate {
+
+    @BeforeEach
+    public void setup() {
+
+    }
+
+    @AfterEach
+    public void afterEach() {
+
+    }
+
+    @Test
+    public void testCustomEventTemplate() {
+        givenBasicAuth().get().contentType(XML).then().post().statusCode(200);
+    }
+}
diff --git a/src/test/java/io/cryostat/HealthTest.java b/src/test/java/io/cryostat/HealthTest.java
index 85ab911fe..e6d9db718 100644
--- a/src/test/java/io/cryostat/HealthTest.java
+++ b/src/test/java/io/cryostat/HealthTest.java
@@ -17,7 +17,6 @@
 
 import static io.restassured.RestAssured.when;
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.*;
 
 import java.util.Optional;
 

From cb76383616fcb2790b5642aa12ab04890853cfe7 Mon Sep 17 00:00:00 2001
From: Ming Wang <miwan@redhat.com>
Date: Wed, 25 Oct 2023 16:03:56 -0400
Subject: [PATCH 03/44] tmp

---
 .../java/io/cryostat/ConfigProperties.java    |  1 +
 .../io/cryostat/events/EventTemplates.java    | 53 +++++++++++--------
 .../java/io/cryostat/CustomEventTemplate.java | 24 +++++++--
 3 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/main/java/io/cryostat/ConfigProperties.java b/src/main/java/io/cryostat/ConfigProperties.java
index 898e22799..c63ef65ad 100644
--- a/src/main/java/io/cryostat/ConfigProperties.java
+++ b/src/main/java/io/cryostat/ConfigProperties.java
@@ -17,6 +17,7 @@
 
 public class ConfigProperties {
     public static final String AWS_BUCKET_NAME_ARCHIVES = "storage.buckets.archives.name";
+    public static final String AWS_EVENT_TEMPLATE_NAME = "storage.buckets.event-templates.name";
     public static final String AWS_OBJECT_EXPIRATION_LABELS =
             "storage.buckets.archives.expiration-label";
 
diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index ab3280c2d..e9cbec391 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -22,7 +22,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
+import java.util.Optional;
 
+import org.jsoup.nodes.Document;
+import org.openjdk.jmc.common.unit.IConstrainedMap;
+import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.JFCGrammar;
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLAttributeInstance;
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLModel;
@@ -32,7 +36,10 @@
 
 import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
 import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
+import io.cryostat.ConfigProperties;
+import io.cryostat.core.FlightRecorderException;
 import io.cryostat.core.templates.Template;
+import io.cryostat.core.templates.TemplateService;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
 import io.cryostat.targets.TargetConnectionManager;
@@ -56,6 +63,9 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
 import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectTaggingRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
 
 import org.jboss.resteasy.reactive.RestPath;
 import org.jboss.resteasy.reactive.RestResponse;
@@ -80,8 +90,8 @@ public class EventTemplates {
     @Inject S3Client storage;
     @Inject Logger logger;
 
-    @ConfigProperty(name = "storage.buckets.event-templates.name")
-    String eventTemplatesBucket;
+    @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_ARCHIVES)
+    static String eventTemplatesBucket;
 
     void onStart(@Observes StartupEvent evt) {
         boolean exists = false;
@@ -193,28 +203,29 @@ public String getTargetTemplate(
                                 .toString());
     }
 
-    // static class S3TemplateService implements TemplateService {
-    //     S3Client s3;
+    static class S3TemplateService implements TemplateService {
+        S3Client s3;
 
-    //     @Override
-    //     public Optional<IConstrainedMap<EventOptionID>> getEvents(String arg0, TemplateType arg1)
-    //             throws FlightRecorderException {
-    //         return Optional.empty();
-    //     }
+        @Override
+        public Optional<IConstrainedMap<EventOptionID>> getEvents(String templateName, TemplateType templateType)
+                throws FlightRecorderException {
+            return Optional.empty();
+        }
 
-    //     @Override
-    //     public List<Template> getTemplates() throws FlightRecorderException {
-    //         var objects = s3.listObjectsV2();
-    //         var templates = convertObjects(objects);
-    //         return templates;
-    //     }
+        @Override
+        public List<Template> getTemplates() throws FlightRecorderException {
+            var builder = ListObjectsV2Request.builder().bucket(eventTemplatesBucket);
+            var objects = s3.listObjectsV2(builder.build());
+            var templates = convertObjects(objects);
+            return templates;
+        }
 
-    //     @Override
-    //     public Optional<Document> getXml(String arg0, TemplateType arg1)
-    //             throws FlightRecorderException {
-    //         return Optional.empty();
-    //     }
-    // }
+        @Override
+        public Optional<Document> getXml(String templateName, TemplateType templateType)
+                throws FlightRecorderException {
+            return Optional.empty();
+        }
+    }
 
     @Blocking
     public Template addTemplate(String templateText)
diff --git a/src/test/java/io/cryostat/CustomEventTemplate.java b/src/test/java/io/cryostat/CustomEventTemplate.java
index a24fa3127..2aac7f208 100644
--- a/src/test/java/io/cryostat/CustomEventTemplate.java
+++ b/src/test/java/io/cryostat/CustomEventTemplate.java
@@ -2,25 +2,43 @@
 
 import static io.cryostat.TestUtils.givenBasicAuth;
 
+import javax.swing.text.AbstractDocument.Content;
+
+import org.apache.http.entity.ContentType;
 import org.eclipse.microprofile.openapi.models.media.XML;
 import org.junit.Test;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
+import io.cryostat.core.templates.Template;
+import io.cryostat.core.templates.TemplateType;
+import io.vertx.core.json.JsonObject;
+import jakarta.transaction.Transactional;
+
 public class CustomEventTemplate {
 
+    Template template;
+    
+    static String TEMPLATE_NAME = "customEventTemplate";
+
     @BeforeEach
     public void setup() {
-
+        template = new Template(TEMPLATE_NAME, "desc", "prov", TemplateType.CUSTOM);
     }
 
     @AfterEach
+    @Transactional
     public void afterEach() {
-
+        template.deleteAll();
     }
 
     @Test
     public void testCustomEventTemplate() {
-        givenBasicAuth().get().contentType(XML).then().post().statusCode(200);
+        givenBasicAuth().get().then().statusCode(200);
+    }
+
+    @Test
+    public void testCustom() {
+        givenBasicAuth().body().contentType(ContentType.APPLICATION_XML).post().then().statusCode(200);
     }
 }

From 3e8d367586bd0b199547724bc3a299a2ae7d9e6e Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:13:18 -0500
Subject: [PATCH 04/44] rename constant

---
 src/main/java/io/cryostat/ConfigProperties.java | 2 +-
 src/main/resources/application.properties       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/cryostat/ConfigProperties.java b/src/main/java/io/cryostat/ConfigProperties.java
index c63ef65ad..cdf783a0c 100644
--- a/src/main/java/io/cryostat/ConfigProperties.java
+++ b/src/main/java/io/cryostat/ConfigProperties.java
@@ -17,7 +17,7 @@
 
 public class ConfigProperties {
     public static final String AWS_BUCKET_NAME_ARCHIVES = "storage.buckets.archives.name";
-    public static final String AWS_EVENT_TEMPLATE_NAME = "storage.buckets.event-templates.name";
+    public static final String AWS_BUCKET_NAME_EVENT_TEMPLATES = "storage.buckets.event-templates.name";
     public static final String AWS_OBJECT_EXPIRATION_LABELS =
             "storage.buckets.archives.expiration-label";
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 61cd7f61f..2d03d8f40 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -58,8 +58,8 @@ storage.presigned-downloads.enabled=false
 storage.transient-archives.enabled=false
 storage.transient-archives.ttl=60s
 storage.buckets.archives.name=archivedrecordings
-storage.buckets.event-templates.name=eventtemplates
 storage.buckets.archives.expiration-label=expiration
+storage.buckets.event-templates.name=eventtemplates
 
 quarkus.quinoa.build-dir=dist
 quarkus.quinoa.enable-spa-routing=true

From c84608e62eaca9b72f90336aa2b82aec74576f73 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:13:30 -0500
Subject: [PATCH 05/44] use correct storage bucket

---
 src/main/java/io/cryostat/events/EventTemplates.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index e9cbec391..457c230ab 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -90,7 +90,7 @@ public class EventTemplates {
     @Inject S3Client storage;
     @Inject Logger logger;
 
-    @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_ARCHIVES)
+    @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_EVENT_TEMPLATES)
     static String eventTemplatesBucket;
 
     void onStart(@Observes StartupEvent evt) {

From 45412229bf40f0cbd71bbe6e598e2e21504f9ac9 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:15:08 -0500
Subject: [PATCH 06/44] update import, apply spotless

---
 .../java/io/cryostat/ConfigProperties.java    |  3 ++-
 .../io/cryostat/events/EventTemplates.java    | 26 +++++++++----------
 .../java/io/cryostat/CustomEventTemplate.java | 19 +++++++-------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/io/cryostat/ConfigProperties.java b/src/main/java/io/cryostat/ConfigProperties.java
index cdf783a0c..f69efd3f1 100644
--- a/src/main/java/io/cryostat/ConfigProperties.java
+++ b/src/main/java/io/cryostat/ConfigProperties.java
@@ -17,7 +17,8 @@
 
 public class ConfigProperties {
     public static final String AWS_BUCKET_NAME_ARCHIVES = "storage.buckets.archives.name";
-    public static final String AWS_BUCKET_NAME_EVENT_TEMPLATES = "storage.buckets.event-templates.name";
+    public static final String AWS_BUCKET_NAME_EVENT_TEMPLATES =
+            "storage.buckets.event-templates.name";
     public static final String AWS_OBJECT_EXPIRATION_LABELS =
             "storage.buckets.archives.expiration-label";
 
diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 457c230ab..7a9337a23 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -21,10 +21,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
-import org.jsoup.nodes.Document;
 import org.openjdk.jmc.common.unit.IConstrainedMap;
 import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.JFCGrammar;
@@ -34,16 +33,17 @@
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLValidationResult;
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.model.EventConfiguration;
 
-import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
-import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
 import io.cryostat.ConfigProperties;
 import io.cryostat.core.FlightRecorderException;
+import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
+import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
 import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateService;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
 import io.cryostat.targets.TargetConnectionManager;
 import io.cryostat.util.HttpStatusCodeIdentifier;
+
 import io.quarkus.runtime.StartupEvent;
 import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
@@ -56,21 +56,19 @@
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Response;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.RestForm;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
-import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
-import software.amazon.awssdk.services.s3.model.GetObjectRequest;
-import software.amazon.awssdk.services.s3.model.GetObjectTaggingRequest;
-import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
-
 import org.jboss.resteasy.reactive.RestPath;
 import org.jboss.resteasy.reactive.RestResponse;
 import org.jboss.resteasy.reactive.multipart.FileUpload;
+import org.jsoup.nodes.Document;
 import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 
 @Path("")
@@ -207,8 +205,8 @@ static class S3TemplateService implements TemplateService {
         S3Client s3;
 
         @Override
-        public Optional<IConstrainedMap<EventOptionID>> getEvents(String templateName, TemplateType templateType)
-                throws FlightRecorderException {
+        public Optional<IConstrainedMap<EventOptionID>> getEvents(
+                String templateName, TemplateType templateType) throws FlightRecorderException {
             return Optional.empty();
         }
 
diff --git a/src/test/java/io/cryostat/CustomEventTemplate.java b/src/test/java/io/cryostat/CustomEventTemplate.java
index 2aac7f208..25f96cfcb 100644
--- a/src/test/java/io/cryostat/CustomEventTemplate.java
+++ b/src/test/java/io/cryostat/CustomEventTemplate.java
@@ -2,23 +2,19 @@
 
 import static io.cryostat.TestUtils.givenBasicAuth;
 
-import javax.swing.text.AbstractDocument.Content;
+import io.cryostat.core.templates.Template;
+import io.cryostat.core.templates.TemplateType;
 
+import jakarta.transaction.Transactional;
 import org.apache.http.entity.ContentType;
-import org.eclipse.microprofile.openapi.models.media.XML;
 import org.junit.Test;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
-import io.cryostat.core.templates.Template;
-import io.cryostat.core.templates.TemplateType;
-import io.vertx.core.json.JsonObject;
-import jakarta.transaction.Transactional;
-
 public class CustomEventTemplate {
 
     Template template;
-    
+
     static String TEMPLATE_NAME = "customEventTemplate";
 
     @BeforeEach
@@ -39,6 +35,11 @@ public void testCustomEventTemplate() {
 
     @Test
     public void testCustom() {
-        givenBasicAuth().body().contentType(ContentType.APPLICATION_XML).post().then().statusCode(200);
+        givenBasicAuth()
+                .body()
+                .contentType(ContentType.APPLICATION_XML)
+                .post()
+                .then()
+                .statusCode(200);
     }
 }

From eeba0050222f118eae23dfccf6a49a239ba58cf8 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:17:27 -0500
Subject: [PATCH 07/44] add license header

---
 .../java/io/cryostat/CustomEventTemplate.java     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/test/java/io/cryostat/CustomEventTemplate.java b/src/test/java/io/cryostat/CustomEventTemplate.java
index 25f96cfcb..65cdb53b1 100644
--- a/src/test/java/io/cryostat/CustomEventTemplate.java
+++ b/src/test/java/io/cryostat/CustomEventTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright The Cryostat Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.cryostat;
 
 import static io.cryostat.TestUtils.givenBasicAuth;

From e7d6e1c93075b577d1564440b347cc925b36d427 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:19:52 -0500
Subject: [PATCH 08/44] temporary hacks to make compilable

---
 .../io/cryostat/events/EventTemplates.java    |  5 +++++
 .../java/io/cryostat/CustomEventTemplate.java | 19 +++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 7a9337a23..88b719961 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -69,6 +69,7 @@
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
 import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 
 @Path("")
@@ -218,6 +219,10 @@ public List<Template> getTemplates() throws FlightRecorderException {
             return templates;
         }
 
+        private List<Template> convertObjects(ListObjectsV2Response objects) {
+            return List.of();
+        }
+
         @Override
         public Optional<Document> getXml(String templateName, TemplateType templateType)
                 throws FlightRecorderException {
diff --git a/src/test/java/io/cryostat/CustomEventTemplate.java b/src/test/java/io/cryostat/CustomEventTemplate.java
index 65cdb53b1..898a24eb4 100644
--- a/src/test/java/io/cryostat/CustomEventTemplate.java
+++ b/src/test/java/io/cryostat/CustomEventTemplate.java
@@ -15,13 +15,12 @@
  */
 package io.cryostat;
 
-import static io.cryostat.TestUtils.givenBasicAuth;
+import static io.restassured.RestAssured.when;
 
 import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
 
 import jakarta.transaction.Transactional;
-import org.apache.http.entity.ContentType;
 import org.junit.Test;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,21 +39,21 @@ public void setup() {
     @AfterEach
     @Transactional
     public void afterEach() {
-        template.deleteAll();
+        // template.deleteAll();
     }
 
     @Test
     public void testCustomEventTemplate() {
-        givenBasicAuth().get().then().statusCode(200);
+        when().get().then().statusCode(200);
     }
 
     @Test
     public void testCustom() {
-        givenBasicAuth()
-                .body()
-                .contentType(ContentType.APPLICATION_XML)
-                .post()
-                .then()
-                .statusCode(200);
+        // givenBasicAuth()
+        //         .body()
+        //         .contentType(ContentType.APPLICATION_XML)
+        //         .post()
+        //         .then()
+        //         .statusCode(200);
     }
 }

From c1243c04760196797841d88e148cf9b569b95352 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:21:16 -0500
Subject: [PATCH 09/44] pre-create event templates bucket

---
 smoketest.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smoketest.bash b/smoketest.bash
index ec5ff0c7e..a9701add4 100755
--- a/smoketest.bash
+++ b/smoketest.bash
@@ -16,7 +16,7 @@ PULL_IMAGES=${PULL_IMAGES:-true}
 KEEP_VOLUMES=${KEEP_VOLUMES:-false}
 OPEN_TABS=${OPEN_TABS:-false}
 
-PRECREATE_BUCKETS=${PRECREATE_BUCKETS:-archivedrecordings,archivedreports}
+PRECREATE_BUCKETS=${PRECREATE_BUCKETS:-archivedrecordings,archivedreports,eventtemplates}
 
 CRYOSTAT_HTTP_PORT=${CRYOSTAT_HTTP_PORT:-8080}
 USE_PROXY=${USE_PROXY:-true}

From 15c4a17649c19b66dc42e178d4a13da9cc4d6cda Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:23:15 -0500
Subject: [PATCH 10/44] injected field should not be static

---
 src/main/java/io/cryostat/events/EventTemplates.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 88b719961..c40c4d354 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -90,7 +90,7 @@ public class EventTemplates {
     @Inject Logger logger;
 
     @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_EVENT_TEMPLATES)
-    static String eventTemplatesBucket;
+    String eventTemplatesBucket;
 
     void onStart(@Observes StartupEvent evt) {
         boolean exists = false;

From e67fc6cb6ff5cb0c5e1c01e03124e06ed06a6eb7 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:24:26 -0500
Subject: [PATCH 11/44] add note

---
 src/main/java/io/cryostat/events/EventTemplates.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index c40c4d354..2d8d2089a 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -93,6 +93,8 @@ public class EventTemplates {
     String eventTemplatesBucket;
 
     void onStart(@Observes StartupEvent evt) {
+        // FIXME refactor this to a reusable utility method since this is done for custom event
+        // templates, archived recordings, and archived reports
         boolean exists = false;
         try {
             exists =

From 192e1e9a08c9776d88fecacef90148c2e6166334 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:44:13 -0500
Subject: [PATCH 12/44] refactor, split out custom event templates service

---
 .../io/cryostat/events/EventTemplates.java    | 154 +--------------
 .../io/cryostat/events/S3TemplateService.java | 183 ++++++++++++++++++
 2 files changed, 185 insertions(+), 152 deletions(-)
 create mode 100644 src/main/java/io/cryostat/events/S3TemplateService.java

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 2d8d2089a..04771872a 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -15,62 +15,32 @@
  */
 package io.cryostat.events;
 
-import java.io.IOException;
 import java.net.URI;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import org.openjdk.jmc.common.unit.IConstrainedMap;
-import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
-import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.JFCGrammar;
-import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLAttributeInstance;
-import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLModel;
-import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLTagInstance;
-import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLValidationResult;
-import org.openjdk.jmc.flightrecorder.controlpanel.ui.model.EventConfiguration;
-
 import io.cryostat.ConfigProperties;
-import io.cryostat.core.FlightRecorderException;
-import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
-import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
 import io.cryostat.core.templates.Template;
-import io.cryostat.core.templates.TemplateService;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
 import io.cryostat.targets.TargetConnectionManager;
-import io.cryostat.util.HttpStatusCodeIdentifier;
 
-import io.quarkus.runtime.StartupEvent;
-import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.Vertx;
 import jakarta.annotation.security.RolesAllowed;
-import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.NotFoundException;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Response;
-import org.apache.hc.core5.http.ContentType;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.RestForm;
 import org.jboss.resteasy.reactive.RestPath;
 import org.jboss.resteasy.reactive.RestResponse;
 import org.jboss.resteasy.reactive.multipart.FileUpload;
-import org.jsoup.nodes.Document;
-import software.amazon.awssdk.core.sync.RequestBody;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
-import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
-import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
-import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
-import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 
 @Path("")
 public class EventTemplates {
@@ -86,38 +56,12 @@ public class EventTemplates {
 
     @Inject Vertx vertx;
     @Inject TargetConnectionManager connectionManager;
-    @Inject S3Client storage;
+    @Inject S3TemplateService customTemplateService;
     @Inject Logger logger;
 
     @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_EVENT_TEMPLATES)
     String eventTemplatesBucket;
 
-    void onStart(@Observes StartupEvent evt) {
-        // FIXME refactor this to a reusable utility method since this is done for custom event
-        // templates, archived recordings, and archived reports
-        boolean exists = false;
-        try {
-            exists =
-                    HttpStatusCodeIdentifier.isSuccessCode(
-                            storage.headBucket(
-                                            HeadBucketRequest.builder()
-                                                    .bucket(eventTemplatesBucket)
-                                                    .build())
-                                    .sdkHttpResponse()
-                                    .statusCode());
-        } catch (Exception e) {
-            logger.info(e);
-        }
-        if (!exists) {
-            try {
-                storage.createBucket(
-                        CreateBucketRequest.builder().bucket(eventTemplatesBucket).build());
-            } catch (Exception e) {
-                logger.error(e);
-            }
-        }
-    }
-
     @GET
     @Path("/api/v1/targets/{connectUrl}/templates")
     @RolesAllowed("read")
@@ -140,7 +84,7 @@ public Uni<Void> postTemplatesV1(@RestForm("template") FileUpload body) throws E
                 .onComplete(
                         ar -> {
                             try {
-                                addTemplate(ar.result().toString());
+                                customTemplateService.addTemplate(ar.result().toString());
                                 cf.complete(null);
                             } catch (Exception e) {
                                 logger.error(e);
@@ -203,98 +147,4 @@ public String getTargetTemplate(
                                 .orElseThrow(NotFoundException::new)
                                 .toString());
     }
-
-    static class S3TemplateService implements TemplateService {
-        S3Client s3;
-
-        @Override
-        public Optional<IConstrainedMap<EventOptionID>> getEvents(
-                String templateName, TemplateType templateType) throws FlightRecorderException {
-            return Optional.empty();
-        }
-
-        @Override
-        public List<Template> getTemplates() throws FlightRecorderException {
-            var builder = ListObjectsV2Request.builder().bucket(eventTemplatesBucket);
-            var objects = s3.listObjectsV2(builder.build());
-            var templates = convertObjects(objects);
-            return templates;
-        }
-
-        private List<Template> convertObjects(ListObjectsV2Response objects) {
-            return List.of();
-        }
-
-        @Override
-        public Optional<Document> getXml(String templateName, TemplateType templateType)
-                throws FlightRecorderException {
-            return Optional.empty();
-        }
-    }
-
-    @Blocking
-    public Template addTemplate(String templateText)
-            throws InvalidXmlException, InvalidEventTemplateException, IOException {
-        try {
-            XMLModel model = EventConfiguration.createModel(templateText);
-            model.checkErrors();
-
-            for (XMLValidationResult result : model.getResults()) {
-                if (result.isError()) {
-                    // throw new InvalidEventTemplateException(result.getText());
-                    throw new IllegalArgumentException(result.getText());
-                }
-            }
-
-            XMLTagInstance configuration = model.getRoot();
-            XMLAttributeInstance labelAttr = null;
-            for (XMLAttributeInstance attr : configuration.getAttributeInstances()) {
-                if (attr.getAttribute().getName().equals("label")) {
-                    labelAttr = attr;
-                    break;
-                }
-            }
-
-            if (labelAttr == null) {
-                // throw new InvalidEventTemplateException(
-                //         "Template has no configuration label attribute");
-                throw new IllegalArgumentException("Template has no configuration label attribute");
-            }
-
-            String templateName = labelAttr.getExplicitValue();
-            templateName = templateName.replaceAll("[\\W]+", "_");
-
-            XMLTagInstance root = model.getRoot();
-            root.setValue(JFCGrammar.ATTRIBUTE_LABEL_MANDATORY, templateName);
-
-            String key = templateName;
-            storage.putObject(
-                    PutObjectRequest.builder()
-                            .bucket(eventTemplatesBucket)
-                            .key(key)
-                            .contentType(ContentType.APPLICATION_XML.getMimeType())
-                            .build(),
-                    RequestBody.fromString(model.toString()));
-
-            return new Template(
-                    templateName,
-                    getAttributeValue(root, "description"),
-                    getAttributeValue(root, "provider"),
-                    TemplateType.CUSTOM);
-        } catch (IOException ioe) {
-            // throw new InvalidXmlException("Unable to parse XML stream", ioe);
-            throw new IllegalArgumentException("Unable to parse XML stream", ioe);
-        } catch (ParseException | IllegalArgumentException e) {
-            // throw new InvalidEventTemplateException("Invalid XML", e);
-            throw new IllegalArgumentException("Invalid XML", e);
-        }
-    }
-
-    protected String getAttributeValue(XMLTagInstance node, String valueKey) {
-        return node.getAttributeInstances().stream()
-                .filter(i -> Objects.equals(valueKey, i.getAttribute().getName()))
-                .map(i -> i.getValue())
-                .findFirst()
-                .get();
-    }
 }
diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
new file mode 100644
index 000000000..d582aafe8
--- /dev/null
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright The Cryostat Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cryostat.events;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.openjdk.jmc.common.unit.IConstrainedMap;
+import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.JFCGrammar;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLAttributeInstance;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLModel;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLTagInstance;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLValidationResult;
+import org.openjdk.jmc.flightrecorder.controlpanel.ui.model.EventConfiguration;
+
+import io.cryostat.ConfigProperties;
+import io.cryostat.core.FlightRecorderException;
+import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
+import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
+import io.cryostat.core.templates.Template;
+import io.cryostat.core.templates.TemplateService;
+import io.cryostat.core.templates.TemplateType;
+import io.cryostat.util.HttpStatusCodeIdentifier;
+
+import io.quarkus.runtime.StartupEvent;
+import io.smallrye.common.annotation.Blocking;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import org.apache.hc.core5.http.ContentType;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.logging.Logger;
+import org.jsoup.nodes.Document;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+@ApplicationScoped
+class S3TemplateService implements TemplateService {
+
+    @Inject S3Client storage;
+    @Inject Logger logger;
+
+    @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_EVENT_TEMPLATES)
+    String eventTemplatesBucket;
+
+    void onStart(@Observes StartupEvent evt) {
+        // FIXME refactor this to a reusable utility method since this is done for custom event
+        // templates, archived recordings, and archived reports
+        boolean exists = false;
+        try {
+            exists =
+                    HttpStatusCodeIdentifier.isSuccessCode(
+                            storage.headBucket(
+                                            HeadBucketRequest.builder()
+                                                    .bucket(eventTemplatesBucket)
+                                                    .build())
+                                    .sdkHttpResponse()
+                                    .statusCode());
+        } catch (Exception e) {
+            logger.info(e);
+        }
+        if (!exists) {
+            try {
+                storage.createBucket(
+                        CreateBucketRequest.builder().bucket(eventTemplatesBucket).build());
+            } catch (Exception e) {
+                logger.error(e);
+            }
+        }
+    }
+
+    @Override
+    public Optional<IConstrainedMap<EventOptionID>> getEvents(
+            String templateName, TemplateType templateType) throws FlightRecorderException {
+        return Optional.empty();
+    }
+
+    @Override
+    public List<Template> getTemplates() throws FlightRecorderException {
+        var builder = ListObjectsV2Request.builder().bucket(eventTemplatesBucket);
+        var objects = storage.listObjectsV2(builder.build());
+        var templates = convertObjects(objects);
+        return templates;
+    }
+
+    private List<Template> convertObjects(ListObjectsV2Response objects) {
+        return List.of();
+    }
+
+    @Override
+    public Optional<Document> getXml(String templateName, TemplateType templateType)
+            throws FlightRecorderException {
+        return Optional.empty();
+    }
+
+    @Blocking
+    public Template addTemplate(String templateText)
+            throws InvalidXmlException, InvalidEventTemplateException, IOException {
+        try {
+            XMLModel model = EventConfiguration.createModel(templateText);
+            model.checkErrors();
+
+            for (XMLValidationResult result : model.getResults()) {
+                if (result.isError()) {
+                    // throw new InvalidEventTemplateException(result.getText());
+                    throw new IllegalArgumentException(result.getText());
+                }
+            }
+
+            XMLTagInstance configuration = model.getRoot();
+            XMLAttributeInstance labelAttr = null;
+            for (XMLAttributeInstance attr : configuration.getAttributeInstances()) {
+                if (attr.getAttribute().getName().equals("label")) {
+                    labelAttr = attr;
+                    break;
+                }
+            }
+
+            if (labelAttr == null) {
+                // throw new InvalidEventTemplateException(
+                //         "Template has no configuration label attribute");
+                throw new IllegalArgumentException("Template has no configuration label attribute");
+            }
+
+            String templateName = labelAttr.getExplicitValue();
+            templateName = templateName.replaceAll("[\\W]+", "_");
+
+            XMLTagInstance root = model.getRoot();
+            root.setValue(JFCGrammar.ATTRIBUTE_LABEL_MANDATORY, templateName);
+
+            String key = templateName;
+            storage.putObject(
+                    PutObjectRequest.builder()
+                            .bucket(eventTemplatesBucket)
+                            .key(key)
+                            .contentType(ContentType.APPLICATION_XML.getMimeType())
+                            .build(),
+                    RequestBody.fromString(model.toString()));
+
+            return new Template(
+                    templateName,
+                    getAttributeValue(root, "description"),
+                    getAttributeValue(root, "provider"),
+                    TemplateType.CUSTOM);
+        } catch (IOException ioe) {
+            // throw new InvalidXmlException("Unable to parse XML stream", ioe);
+            throw new IllegalArgumentException("Unable to parse XML stream", ioe);
+        } catch (ParseException | IllegalArgumentException e) {
+            // throw new InvalidEventTemplateException("Invalid XML", e);
+            throw new IllegalArgumentException("Invalid XML", e);
+        }
+    }
+
+    protected String getAttributeValue(XMLTagInstance node, String valueKey) {
+        return node.getAttributeInstances().stream()
+                .filter(i -> Objects.equals(valueKey, i.getAttribute().getName()))
+                .map(i -> i.getValue())
+                .findFirst()
+                .get();
+    }
+}

From 315ace3ca14796b11562f20a861f7a4eebab4baa Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 10:58:20 -0500
Subject: [PATCH 13/44] extract target templates service to separate class

---
 .../io/cryostat/events/EventTemplates.java    | 39 +++++----
 .../events/TargetTemplateService.java         | 79 +++++++++++++++++++
 2 files changed, 97 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/io/cryostat/events/TargetTemplateService.java

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 04771872a..4a3873b3e 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -24,14 +24,13 @@
 import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
-import io.cryostat.targets.TargetConnectionManager;
 
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.Vertx;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
+import jakarta.ws.rs.BadRequestException;
 import jakarta.ws.rs.GET;
-import jakarta.ws.rs.NotFoundException;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Response;
@@ -55,13 +54,10 @@ public class EventTemplates {
                     TemplateType.TARGET);
 
     @Inject Vertx vertx;
-    @Inject TargetConnectionManager connectionManager;
+    @Inject TargetTemplateService.Factory targetTemplateServiceFactory;
     @Inject S3TemplateService customTemplateService;
     @Inject Logger logger;
 
-    @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_EVENT_TEMPLATES)
-    String eventTemplatesBucket;
-
     @GET
     @Path("/api/v1/targets/{connectUrl}/templates")
     @RolesAllowed("read")
@@ -122,14 +118,11 @@ public Response getTargetTemplateV1(
     @RolesAllowed("read")
     public List<Template> listTemplates(@RestPath long id) throws Exception {
         Target target = Target.find("id", id).singleResult();
-        return connectionManager.executeConnectedTask(
-                target,
-                connection -> {
-                    List<Template> list =
-                            new ArrayList<>(connection.getTemplateService().getTemplates());
-                    list.add(ALL_EVENTS_TEMPLATE);
-                    return list;
-                });
+        var list = new ArrayList<Template>();
+        list.add(ALL_EVENTS_TEMPLATE);
+        list.addAll(targetTemplateServiceFactory.create(target).getTemplates());
+        list.addAll(customTemplateService.getTemplates());
+        return list;
     }
 
     @GET
@@ -139,12 +132,16 @@ public String getTargetTemplate(
             @RestPath long id, @RestPath String templateName, @RestPath TemplateType templateType)
             throws Exception {
         Target target = Target.find("id", id).singleResult();
-        return connectionManager.executeConnectedTask(
-                target,
-                conn ->
-                        conn.getTemplateService()
-                                .getXml(templateName, templateType)
-                                .orElseThrow(NotFoundException::new)
-                                .toString());
+        switch (templateType) {
+            case TARGET:
+                return targetTemplateServiceFactory
+                        .create(target)
+                        .getXml(templateName, templateType)
+                        .toString();
+            case CUSTOM:
+                return customTemplateService.getXml(templateName, templateType).toString();
+            default:
+                throw new BadRequestException();
+        }
     }
 }
diff --git a/src/main/java/io/cryostat/events/TargetTemplateService.java b/src/main/java/io/cryostat/events/TargetTemplateService.java
new file mode 100644
index 000000000..3f69cb957
--- /dev/null
+++ b/src/main/java/io/cryostat/events/TargetTemplateService.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright The Cryostat Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cryostat.events;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.openjdk.jmc.common.unit.IConstrainedMap;
+import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
+
+import io.cryostat.core.FlightRecorderException;
+import io.cryostat.core.templates.Template;
+import io.cryostat.core.templates.TemplateService;
+import io.cryostat.core.templates.TemplateType;
+import io.cryostat.targets.Target;
+import io.cryostat.targets.TargetConnectionManager;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import org.jsoup.nodes.Document;
+
+class TargetTemplateService implements TemplateService {
+
+    @ApplicationScoped
+    static class Factory {
+        @Inject TargetConnectionManager connectionManager;
+
+        TargetTemplateService create(Target target) {
+            return new TargetTemplateService(connectionManager, target);
+        }
+    }
+
+    private final TargetConnectionManager connectionManager;
+    private final Target target;
+
+    public TargetTemplateService(TargetConnectionManager connectionManager, Target target) {
+        this.connectionManager = connectionManager;
+        this.target = target;
+    }
+
+    @Override
+    public List<Template> getTemplates() throws FlightRecorderException {
+        return connectionManager.executeConnectedTask(
+                target,
+                connection ->
+                        connection.getTemplateService().getTemplates().stream()
+                                .filter(t -> t.getType().equals(TemplateType.TARGET))
+                                .toList());
+    }
+
+    @Override
+    public Optional<Document> getXml(String templateName, TemplateType unused)
+            throws FlightRecorderException {
+        return connectionManager.executeConnectedTask(
+                target,
+                conn -> conn.getTemplateService().getXml(templateName, TemplateType.TARGET));
+    }
+
+    @Override
+    public Optional<IConstrainedMap<EventOptionID>> getEvents(
+            String templateName, TemplateType unused) throws FlightRecorderException {
+        return connectionManager.executeConnectedTask(
+                target,
+                conn -> conn.getTemplateService().getEvents(templateName, TemplateType.TARGET));
+    }
+}

From fd9463cc0da92b4cc5452b41a22daae97e89addb Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 11:00:42 -0500
Subject: [PATCH 14/44] make constructor private

---
 src/main/java/io/cryostat/events/TargetTemplateService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/cryostat/events/TargetTemplateService.java b/src/main/java/io/cryostat/events/TargetTemplateService.java
index 3f69cb957..ba3060e08 100644
--- a/src/main/java/io/cryostat/events/TargetTemplateService.java
+++ b/src/main/java/io/cryostat/events/TargetTemplateService.java
@@ -46,7 +46,7 @@ TargetTemplateService create(Target target) {
     private final TargetConnectionManager connectionManager;
     private final Target target;
 
-    public TargetTemplateService(TargetConnectionManager connectionManager, Target target) {
+    private TargetTemplateService(TargetConnectionManager connectionManager, Target target) {
         this.connectionManager = connectionManager;
         this.target = target;
     }

From 29728e39c97682036ab010795147e823786af12b Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 11:04:33 -0500
Subject: [PATCH 15/44] cleanup

---
 .../java/io/cryostat/events/EventTemplates.java    |  2 --
 .../java/io/cryostat/events/S3TemplateService.java | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 4a3873b3e..e0cea8b52 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import io.cryostat.ConfigProperties;
 import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
@@ -34,7 +33,6 @@
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Response;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.RestForm;
 import org.jboss.resteasy.reactive.RestPath;
diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index d582aafe8..afd8592c9 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -124,8 +124,8 @@ public Template addTemplate(String templateText)
 
             for (XMLValidationResult result : model.getResults()) {
                 if (result.isError()) {
-                    // throw new InvalidEventTemplateException(result.getText());
-                    throw new IllegalArgumentException(result.getText());
+                    throw new IllegalArgumentException(
+                            new InvalidEventTemplateException(result.getText()));
                 }
             }
 
@@ -139,9 +139,9 @@ public Template addTemplate(String templateText)
             }
 
             if (labelAttr == null) {
-                // throw new InvalidEventTemplateException(
-                //         "Template has no configuration label attribute");
-                throw new IllegalArgumentException("Template has no configuration label attribute");
+                throw new IllegalArgumentException(
+                        new InvalidEventTemplateException(
+                                "Template has no configuration label attribute"));
             }
 
             String templateName = labelAttr.getExplicitValue();
@@ -165,11 +165,11 @@ public Template addTemplate(String templateText)
                     getAttributeValue(root, "provider"),
                     TemplateType.CUSTOM);
         } catch (IOException ioe) {
+            // FIXME InvalidXmlException constructor should be made public in -core
             // throw new InvalidXmlException("Unable to parse XML stream", ioe);
             throw new IllegalArgumentException("Unable to parse XML stream", ioe);
         } catch (ParseException | IllegalArgumentException e) {
-            // throw new InvalidEventTemplateException("Invalid XML", e);
-            throw new IllegalArgumentException("Invalid XML", e);
+            throw new IllegalArgumentException(new InvalidEventTemplateException("Invalid XML", e));
         }
     }
 

From 6c3d60500b4131a89ef7fa61f656a84016ab5dd8 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 11:06:14 -0500
Subject: [PATCH 16/44] add note, reorder parameters

---
 src/main/java/io/cryostat/events/EventTemplates.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index e0cea8b52..6b4e3db2b 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -71,6 +71,7 @@ public Response listTemplatesV1(@RestPath URI connectUrl) throws Exception {
     @Path("/api/v1/templates")
     @RolesAllowed("write")
     public Uni<Void> postTemplatesV1(@RestForm("template") FileUpload body) throws Exception {
+        // FIXME this should redirect to a POST /api/v3/event_templates
         CompletableFuture<Void> cf = new CompletableFuture<>();
         var path = body.filePath();
         vertx.fileSystem()
@@ -107,7 +108,7 @@ public Response getTargetTemplateV1(
                         URI.create(
                                 String.format(
                                         "/api/v3/targets/%d/event_templates/%s/%s",
-                                        target.id, templateName, templateType)))
+                                        target.id, templateType, templateName)))
                 .build();
     }
 
@@ -124,10 +125,10 @@ public List<Template> listTemplates(@RestPath long id) throws Exception {
     }
 
     @GET
-    @Path("/api/v3/targets/{id}/event_templates/{templateName}/{templateType}")
+    @Path("/api/v3/targets/{id}/event_templates/{templateType}/{templateName}")
     @RolesAllowed("read")
     public String getTargetTemplate(
-            @RestPath long id, @RestPath String templateName, @RestPath TemplateType templateType)
+            @RestPath long id, @RestPath TemplateType templateType, @RestPath String templateName)
             throws Exception {
         Target target = Target.find("id", id).singleResult();
         switch (templateType) {

From a21a91f83f635ea4934f4c75f3db7ea55bae2074 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 11:09:54 -0500
Subject: [PATCH 17/44] add endpoint for listing only custom templates

---
 src/main/java/io/cryostat/events/EventTemplates.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 6b4e3db2b..7186b23cf 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -112,10 +112,20 @@ public Response getTargetTemplateV1(
                 .build();
     }
 
+    @GET
+    @Path("/api/v3/event_templates")
+    @RolesAllowed("read")
+    public List<Template> listTemplates() throws Exception {
+        var list = new ArrayList<Template>();
+        list.add(ALL_EVENTS_TEMPLATE);
+        list.addAll(customTemplateService.getTemplates());
+        return list;
+    }
+
     @GET
     @Path("/api/v3/targets/{id}/event_templates")
     @RolesAllowed("read")
-    public List<Template> listTemplates(@RestPath long id) throws Exception {
+    public List<Template> listTargetTemplates(@RestPath long id) throws Exception {
         Target target = Target.find("id", id).singleResult();
         var list = new ArrayList<Template>();
         list.add(ALL_EVENTS_TEMPLATE);

From 0d10a98fc226aab32953682b2096a15f6046a7fe Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 11:11:09 -0500
Subject: [PATCH 18/44] update type signature

---
 src/main/java/io/cryostat/events/S3TemplateService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index afd8592c9..0c4e9991a 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -53,8 +53,8 @@
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
 import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
-import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.S3Object;
 
 @ApplicationScoped
 class S3TemplateService implements TemplateService {
@@ -100,12 +100,12 @@ public Optional<IConstrainedMap<EventOptionID>> getEvents(
     @Override
     public List<Template> getTemplates() throws FlightRecorderException {
         var builder = ListObjectsV2Request.builder().bucket(eventTemplatesBucket);
-        var objects = storage.listObjectsV2(builder.build());
+        var objects = storage.listObjectsV2(builder.build()).contents();
         var templates = convertObjects(objects);
         return templates;
     }
 
-    private List<Template> convertObjects(ListObjectsV2Response objects) {
+    private List<Template> convertObjects(List<S3Object> objects) {
         return List.of();
     }
 

From 7b0cf11df6ef677b23bb87d39a5145cc32988464 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 11:49:19 -0500
Subject: [PATCH 19/44] tmp

---
 .../io/cryostat/events/S3TemplateService.java | 136 ++++++++++++++++--
 1 file changed, 121 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 0c4e9991a..1aaf48af9 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -15,13 +15,18 @@
  */
 package io.cryostat.events;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
 import org.openjdk.jmc.common.unit.IConstrainedMap;
+import org.openjdk.jmc.common.unit.SimpleConstrainedMap;
+import org.openjdk.jmc.common.unit.UnitLookup;
 import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.JFCGrammar;
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.model.xml.XMLAttributeInstance;
@@ -47,10 +52,13 @@
 import org.apache.hc.core5.http.ContentType;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
+import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
+import org.jsoup.parser.Parser;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
@@ -93,33 +101,117 @@ void onStart(@Observes StartupEvent evt) {
 
     @Override
     public Optional<IConstrainedMap<EventOptionID>> getEvents(
-            String templateName, TemplateType templateType) throws FlightRecorderException {
-        return Optional.empty();
+            String templateName, TemplateType unused) throws FlightRecorderException {
+        return getObject(templateName)
+                .map(this::getContents)
+                .map(
+                        stream -> {
+                            try {
+                                return new EventConfiguration(parseXml(stream))
+                                        .getEventOptions(
+                                                new SimpleConstrainedMap<>(
+                                                        UnitLookup.PLAIN_TEXT.getPersister()));
+                            } catch (IOException | ParseException e) {
+                                logger.error(e);
+                                return null;
+                            }
+                        });
     }
 
     @Override
     public List<Template> getTemplates() throws FlightRecorderException {
+        return convertObjects(getObjects());
+    }
+
+    @Override
+    public Optional<Document> getXml(String templateName, TemplateType unused)
+            throws FlightRecorderException {
+        return getObject(templateName)
+                .map(this::getContents)
+                .map(
+                        stream -> {
+                            try (stream) {
+                                Document doc =
+                                        Jsoup.parse(
+                                                stream,
+                                                StandardCharsets.UTF_8.name(),
+                                                "",
+                                                Parser.xmlParser());
+                                return doc;
+                            } catch (IOException e) {
+                                logger.error(e);
+                                return null;
+                            }
+                        });
+    }
+
+    @Blocking
+    private Optional<S3Object> getObject(String name) {
+        // FIXME do this by querying for a single S3Object rather than list and filter
+        return getObjects().stream().filter(o -> o.key().equals(name)).findFirst();
+    }
+
+    @Blocking
+    private List<S3Object> getObjects() {
         var builder = ListObjectsV2Request.builder().bucket(eventTemplatesBucket);
-        var objects = storage.listObjectsV2(builder.build()).contents();
-        var templates = convertObjects(objects);
-        return templates;
+        return storage.listObjectsV2(builder.build()).contents();
     }
 
     private List<Template> convertObjects(List<S3Object> objects) {
-        return List.of();
+        return objects.stream()
+                .map(
+                        t -> {
+                            try {
+                                return convertObject(t);
+                            } catch (IOException
+                                    | ParseException
+                                    | InvalidEventTemplateException e) {
+                                logger.error(e);
+                                return null;
+                            }
+                        })
+                .toList();
     }
 
-    @Override
-    public Optional<Document> getXml(String templateName, TemplateType templateType)
-            throws FlightRecorderException {
-        return Optional.empty();
+    private Template convertObject(S3Object object)
+            throws IOException, ParseException, InvalidEventTemplateException {
+        var xml = parseXml(getContents(object));
+
+        // XMLAttributeInstance descAttr = null, providerAttr = null;
+        // var configuration = xml.getRoot();
+        // for (var attr : configuration.getAttributeInstances()) {
+        //     if (attr.getAttribute().getName().equals("description")) {
+        //         descAttr = attr;
+        //         break;
+        //     } else if (attr.getAttribute().getName().equals("provider")) {
+        //         providerAttr = attr;
+        //         break;
+        //     }
+        // }
+        // if (descAttr == null) {
+        //     throw new InvalidEventTemplateException("\"description\" attribute not found");
+        // }
+        // if (providerAttr == null) {
+        //     throw new InvalidEventTemplateException("\"provider\" attribute not found");
+        // }
+
+        return new Template(
+                object.key(),
+                "",
+                "unknown",
+                // descAttr.getExplicitValue(),
+                // providerAttr.getExplicitValue(),
+                TemplateType.CUSTOM);
     }
 
-    @Blocking
-    public Template addTemplate(String templateText)
-            throws InvalidXmlException, InvalidEventTemplateException, IOException {
-        try {
-            XMLModel model = EventConfiguration.createModel(templateText);
+    private InputStream getContents(S3Object object) {
+        var req = GetObjectRequest.builder().bucket(eventTemplatesBucket).key(object.key()).build();
+        return storage.getObject(req);
+    }
+
+    private XMLModel parseXml(InputStream inputStream) throws IOException, ParseException {
+        try (inputStream) {
+            var model = EventConfiguration.createModel(inputStream);
             model.checkErrors();
 
             for (XMLValidationResult result : model.getResults()) {
@@ -128,6 +220,18 @@ public Template addTemplate(String templateText)
                             new InvalidEventTemplateException(result.getText()));
                 }
             }
+            return model;
+        }
+    }
+
+    @Blocking
+    public Template addTemplate(String templateText)
+            throws InvalidXmlException, InvalidEventTemplateException, IOException {
+        try {
+            XMLModel model =
+                    parseXml(
+                            new ByteArrayInputStream(
+                                    templateText.getBytes(StandardCharsets.UTF_8)));
 
             XMLTagInstance configuration = model.getRoot();
             XMLAttributeInstance labelAttr = null;
@@ -150,6 +254,8 @@ public Template addTemplate(String templateText)
             XMLTagInstance root = model.getRoot();
             root.setValue(JFCGrammar.ATTRIBUTE_LABEL_MANDATORY, templateName);
 
+            // TODO put the template description, provider, and other attributes in metadata so we
+            // don't need to download and parse the whole XML just to display the templates list
             String key = templateName;
             storage.putObject(
                     PutObjectRequest.builder()

From 0456058547bf749fcd55e9fd6518d63ca4acdb33 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 12:40:52 -0500
Subject: [PATCH 20/44] store attrs as metadata tags

---
 .../io/cryostat/events/S3TemplateService.java | 130 ++++++++++++------
 1 file changed, 89 insertions(+), 41 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 1aaf48af9..e4a22364f 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -20,7 +20,9 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -36,6 +38,7 @@
 import org.openjdk.jmc.flightrecorder.controlpanel.ui.model.EventConfiguration;
 
 import io.cryostat.ConfigProperties;
+import io.cryostat.Producers;
 import io.cryostat.core.FlightRecorderException;
 import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
 import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
@@ -49,6 +52,9 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.hc.core5.http.ContentType;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
@@ -59,15 +65,23 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectTaggingRequest;
 import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.S3Object;
+import software.amazon.awssdk.services.s3.model.Tag;
+import software.amazon.awssdk.services.s3.model.Tagging;
 
 @ApplicationScoped
 class S3TemplateService implements TemplateService {
 
     @Inject S3Client storage;
+
+    @Inject
+    @Named(Producers.BASE64_URL)
+    Base64 base64Url;
+
     @Inject Logger logger;
 
     @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_EVENT_TEMPLATES)
@@ -147,7 +161,6 @@ public Optional<Document> getXml(String templateName, TemplateType unused)
 
     @Blocking
     private Optional<S3Object> getObject(String name) {
-        // FIXME do this by querying for a single S3Object rather than list and filter
         return getObjects().stream().filter(o -> o.key().equals(name)).findFirst();
     }
 
@@ -163,9 +176,7 @@ private List<Template> convertObjects(List<S3Object> objects) {
                         t -> {
                             try {
                                 return convertObject(t);
-                            } catch (IOException
-                                    | ParseException
-                                    | InvalidEventTemplateException e) {
+                            } catch (InvalidEventTemplateException e) {
                                 logger.error(e);
                                 return null;
                             }
@@ -173,42 +184,57 @@ private List<Template> convertObjects(List<S3Object> objects) {
                 .toList();
     }
 
-    private Template convertObject(S3Object object)
-            throws IOException, ParseException, InvalidEventTemplateException {
-        var xml = parseXml(getContents(object));
-
-        // XMLAttributeInstance descAttr = null, providerAttr = null;
-        // var configuration = xml.getRoot();
-        // for (var attr : configuration.getAttributeInstances()) {
-        //     if (attr.getAttribute().getName().equals("description")) {
-        //         descAttr = attr;
-        //         break;
-        //     } else if (attr.getAttribute().getName().equals("provider")) {
-        //         providerAttr = attr;
-        //         break;
-        //     }
-        // }
-        // if (descAttr == null) {
-        //     throw new InvalidEventTemplateException("\"description\" attribute not found");
-        // }
-        // if (providerAttr == null) {
-        //     throw new InvalidEventTemplateException("\"provider\" attribute not found");
-        // }
+    private Template convertObject(S3Object object) throws InvalidEventTemplateException {
+        var req =
+                GetObjectTaggingRequest.builder()
+                        .bucket(eventTemplatesBucket)
+                        .key(object.key())
+                        .build();
+        var tagging = storage.getObjectTagging(req);
+        var list = tagging.tagSet();
+        if (!tagging.hasTagSet() || list.isEmpty()) {
+            throw new InvalidEventTemplateException("No metadata found");
+        }
+        var decodedList = new ArrayList<Pair<String, String>>();
+        list.forEach(
+                t -> {
+                    var encodedKey = t.key();
+                    var decodedKey =
+                            new String(base64Url.decode(encodedKey), StandardCharsets.UTF_8);
+                    var encodedValue = t.value();
+                    var decodedValue =
+                            new String(base64Url.decode(encodedValue), StandardCharsets.UTF_8);
+                    decodedList.add(Pair.of(decodedKey, decodedValue));
+                });
+        var label =
+                decodedList.stream()
+                        .filter(t -> t.getKey().equals("label"))
+                        .map(Pair::getValue)
+                        .findFirst()
+                        .orElseThrow();
+        var description =
+                decodedList.stream()
+                        .filter(t -> t.getKey().equals("description"))
+                        .map(Pair::getValue)
+                        .findFirst()
+                        .orElseThrow();
+        var provider =
+                decodedList.stream()
+                        .filter(t -> t.getKey().equals("provider"))
+                        .map(Pair::getValue)
+                        .findFirst()
+                        .orElseThrow();
 
-        return new Template(
-                object.key(),
-                "",
-                "unknown",
-                // descAttr.getExplicitValue(),
-                // providerAttr.getExplicitValue(),
-                TemplateType.CUSTOM);
+        return new Template(label, description, provider, TemplateType.CUSTOM);
     }
 
+    @Blocking
     private InputStream getContents(S3Object object) {
         var req = GetObjectRequest.builder().bucket(eventTemplatesBucket).key(object.key()).build();
         return storage.getObject(req);
     }
 
+    @Blocking
     private XMLModel parseXml(InputStream inputStream) throws IOException, ParseException {
         try (inputStream) {
             var model = EventConfiguration.createModel(inputStream);
@@ -254,22 +280,18 @@ public Template addTemplate(String templateText)
             XMLTagInstance root = model.getRoot();
             root.setValue(JFCGrammar.ATTRIBUTE_LABEL_MANDATORY, templateName);
 
-            // TODO put the template description, provider, and other attributes in metadata so we
-            // don't need to download and parse the whole XML just to display the templates list
-            String key = templateName;
+            String description = getAttributeValue(root, "description");
+            String provider = getAttributeValue(root, "provider");
             storage.putObject(
                     PutObjectRequest.builder()
                             .bucket(eventTemplatesBucket)
-                            .key(key)
+                            .key(templateName)
                             .contentType(ContentType.APPLICATION_XML.getMimeType())
+                            .tagging(createTemplateTagging(templateName, description, provider))
                             .build(),
                     RequestBody.fromString(model.toString()));
 
-            return new Template(
-                    templateName,
-                    getAttributeValue(root, "description"),
-                    getAttributeValue(root, "provider"),
-                    TemplateType.CUSTOM);
+            return new Template(templateName, description, provider, TemplateType.CUSTOM);
         } catch (IOException ioe) {
             // FIXME InvalidXmlException constructor should be made public in -core
             // throw new InvalidXmlException("Unable to parse XML stream", ioe);
@@ -279,6 +301,32 @@ public Template addTemplate(String templateText)
         }
     }
 
+    private Tagging createTemplateTagging(
+            String templateName, String description, String provider) {
+        var map = Map.of("label", templateName, "description", description, "provider", provider);
+        var tags = new ArrayList<Tag>();
+        tags.addAll(
+                map.entrySet().stream()
+                        .map(
+                                e ->
+                                        Tag.builder()
+                                                .key(
+                                                        base64Url.encodeAsString(
+                                                                e.getKey()
+                                                                        .getBytes(
+                                                                                StandardCharsets
+                                                                                        .UTF_8)))
+                                                .value(
+                                                        base64Url.encodeAsString(
+                                                                e.getValue()
+                                                                        .getBytes(
+                                                                                StandardCharsets
+                                                                                        .UTF_8)))
+                                                .build())
+                        .toList());
+        return Tagging.builder().tagSet(tags).build();
+    }
+
     protected String getAttributeValue(XMLTagInstance node, String valueKey) {
         return node.getAttributeInstances().stream()
                 .filter(i -> Objects.equals(valueKey, i.getAttribute().getName()))

From 5e8f24c778e3e7bbca9ad1a5d752c94a274c792d Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 12:49:46 -0500
Subject: [PATCH 21/44] refactor cleanup

---
 .../io/cryostat/events/S3TemplateService.java | 91 +++++++------------
 1 file changed, 34 insertions(+), 57 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index e4a22364f..6588f7661 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -116,52 +116,45 @@ void onStart(@Observes StartupEvent evt) {
     @Override
     public Optional<IConstrainedMap<EventOptionID>> getEvents(
             String templateName, TemplateType unused) throws FlightRecorderException {
-        return getObject(templateName)
-                .map(this::getContents)
-                .map(
-                        stream -> {
-                            try {
-                                return new EventConfiguration(parseXml(stream))
-                                        .getEventOptions(
-                                                new SimpleConstrainedMap<>(
-                                                        UnitLookup.PLAIN_TEXT.getPersister()));
-                            } catch (IOException | ParseException e) {
-                                logger.error(e);
-                                return null;
-                            }
-                        });
+        try (var stream = getModel(templateName)) {
+            return Optional.of(
+                    new EventConfiguration(parseXml(stream))
+                            .getEventOptions(
+                                    new SimpleConstrainedMap<>(
+                                            UnitLookup.PLAIN_TEXT.getPersister())));
+        } catch (IOException | ParseException e) {
+            logger.error(e);
+            return Optional.empty();
+        }
     }
 
     @Override
     public List<Template> getTemplates() throws FlightRecorderException {
-        return convertObjects(getObjects());
-    }
-
-    @Override
-    public Optional<Document> getXml(String templateName, TemplateType unused)
-            throws FlightRecorderException {
-        return getObject(templateName)
-                .map(this::getContents)
+        return getObjects().stream()
                 .map(
-                        stream -> {
-                            try (stream) {
-                                Document doc =
-                                        Jsoup.parse(
-                                                stream,
-                                                StandardCharsets.UTF_8.name(),
-                                                "",
-                                                Parser.xmlParser());
-                                return doc;
-                            } catch (IOException e) {
+                        t -> {
+                            try {
+                                return convertObject(t);
+                            } catch (InvalidEventTemplateException e) {
                                 logger.error(e);
                                 return null;
                             }
-                        });
+                        })
+                .filter(Objects::nonNull)
+                .toList();
     }
 
-    @Blocking
-    private Optional<S3Object> getObject(String name) {
-        return getObjects().stream().filter(o -> o.key().equals(name)).findFirst();
+    @Override
+    public Optional<Document> getXml(String templateName, TemplateType unused)
+            throws FlightRecorderException {
+        try (var stream = getModel(templateName)) {
+            Document doc =
+                    Jsoup.parse(stream, StandardCharsets.UTF_8.name(), "", Parser.xmlParser());
+            return Optional.of(doc);
+        } catch (IOException e) {
+            logger.error(e);
+            return Optional.empty();
+        }
     }
 
     @Blocking
@@ -170,20 +163,7 @@ private List<S3Object> getObjects() {
         return storage.listObjectsV2(builder.build()).contents();
     }
 
-    private List<Template> convertObjects(List<S3Object> objects) {
-        return objects.stream()
-                .map(
-                        t -> {
-                            try {
-                                return convertObject(t);
-                            } catch (InvalidEventTemplateException e) {
-                                logger.error(e);
-                                return null;
-                            }
-                        })
-                .toList();
-    }
-
+    @Blocking
     private Template convertObject(S3Object object) throws InvalidEventTemplateException {
         var req =
                 GetObjectTaggingRequest.builder()
@@ -229,8 +209,8 @@ private Template convertObject(S3Object object) throws InvalidEventTemplateExcep
     }
 
     @Blocking
-    private InputStream getContents(S3Object object) {
-        var req = GetObjectRequest.builder().bucket(eventTemplatesBucket).key(object.key()).build();
+    private InputStream getModel(String name) {
+        var req = GetObjectRequest.builder().bucket(eventTemplatesBucket).key(name).build();
         return storage.getObject(req);
     }
 
@@ -253,11 +233,8 @@ private XMLModel parseXml(InputStream inputStream) throws IOException, ParseExce
     @Blocking
     public Template addTemplate(String templateText)
             throws InvalidXmlException, InvalidEventTemplateException, IOException {
-        try {
-            XMLModel model =
-                    parseXml(
-                            new ByteArrayInputStream(
-                                    templateText.getBytes(StandardCharsets.UTF_8)));
+        try (var stream = new ByteArrayInputStream(templateText.getBytes(StandardCharsets.UTF_8))) {
+            XMLModel model = parseXml(stream);
 
             XMLTagInstance configuration = model.getRoot();
             XMLAttributeInstance labelAttr = null;

From 707e1010a3ccaa17163fb0359f2f799f138c2478 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 12:55:39 -0500
Subject: [PATCH 22/44] publish notification on template upload

---
 .../java/io/cryostat/events/S3TemplateService.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 6588f7661..182c5a4a3 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -46,9 +46,12 @@
 import io.cryostat.core.templates.TemplateService;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.util.HttpStatusCodeIdentifier;
+import io.cryostat.ws.MessagingServer;
+import io.cryostat.ws.Notification;
 
 import io.quarkus.runtime.StartupEvent;
 import io.smallrye.common.annotation.Blocking;
+import io.vertx.core.eventbus.EventBus;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
@@ -76,8 +79,13 @@
 @ApplicationScoped
 class S3TemplateService implements TemplateService {
 
+    public static final String EVENT_TEMPLATE_CREATED = "TemplateUploaded";
+    public static final String EVENT_TEMPLATE_DELETED = "TemplateDeleted";
+
     @Inject S3Client storage;
 
+    @Inject EventBus bus;
+
     @Inject
     @Named(Producers.BASE64_URL)
     Base64 base64Url;
@@ -268,7 +276,11 @@ public Template addTemplate(String templateText)
                             .build(),
                     RequestBody.fromString(model.toString()));
 
-            return new Template(templateName, description, provider, TemplateType.CUSTOM);
+            var template = new Template(templateName, description, provider, TemplateType.CUSTOM);
+            bus.publish(
+                    MessagingServer.class.getName(),
+                    new Notification(EVENT_TEMPLATE_CREATED, template));
+            return template;
         } catch (IOException ioe) {
             // FIXME InvalidXmlException constructor should be made public in -core
             // throw new InvalidXmlException("Unable to parse XML stream", ioe);

From 8a08f500e2220f5cc5328abe4057c14e1a795803 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 13:14:36 -0500
Subject: [PATCH 23/44] implement DELETE custom template

---
 .../io/cryostat/events/EventTemplates.java    | 15 +++++++++---
 .../io/cryostat/events/S3TemplateService.java | 23 +++++++++++++++----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 7186b23cf..e6105359e 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -24,11 +24,13 @@
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
 
+import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.Vertx;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
@@ -68,9 +70,10 @@ public Response listTemplatesV1(@RestPath URI connectUrl) throws Exception {
     }
 
     @POST
+    @Blocking
     @Path("/api/v1/templates")
     @RolesAllowed("write")
-    public Uni<Void> postTemplatesV1(@RestForm("template") FileUpload body) throws Exception {
+    public Uni<Void> postTemplatesV1(@RestForm("template") FileUpload body) {
         // FIXME this should redirect to a POST /api/v3/event_templates
         CompletableFuture<Void> cf = new CompletableFuture<>();
         var path = body.filePath();
@@ -94,14 +97,20 @@ public Uni<Void> postTemplatesV1(@RestForm("template") FileUpload body) throws E
         return Uni.createFrom().future(cf);
     }
 
+    @DELETE
+    @Path("/api/v1/templates/{templateName}")
+    @RolesAllowed("write")
+    public void deleteTemplatesV1(@RestPath String templateName) {
+        customTemplateService.removeTemplate(templateName);
+    }
+
     @GET
     @Path("/api/v1/targets/{connectUrl}/templates/{templateName}/type/{templateType}")
     @RolesAllowed("read")
     public Response getTargetTemplateV1(
             @RestPath URI connectUrl,
             @RestPath String templateName,
-            @RestPath TemplateType templateType)
-            throws Exception {
+            @RestPath TemplateType templateType) {
         Target target = Target.getTargetByConnectUrl(connectUrl);
         return Response.status(RestResponse.Status.PERMANENT_REDIRECT)
                 .location(
diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 182c5a4a3..5ec123b96 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -67,6 +67,7 @@
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectTaggingRequest;
 import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
@@ -79,8 +80,8 @@
 @ApplicationScoped
 class S3TemplateService implements TemplateService {
 
-    public static final String EVENT_TEMPLATE_CREATED = "TemplateUploaded";
-    public static final String EVENT_TEMPLATE_DELETED = "TemplateDeleted";
+    static final String EVENT_TEMPLATE_CREATED = "TemplateUploaded";
+    static final String EVENT_TEMPLATE_DELETED = "TemplateDeleted";
 
     @Inject S3Client storage;
 
@@ -239,7 +240,7 @@ private XMLModel parseXml(InputStream inputStream) throws IOException, ParseExce
     }
 
     @Blocking
-    public Template addTemplate(String templateText)
+    Template addTemplate(String templateText)
             throws InvalidXmlException, InvalidEventTemplateException, IOException {
         try (var stream = new ByteArrayInputStream(templateText.getBytes(StandardCharsets.UTF_8))) {
             XMLModel model = parseXml(stream);
@@ -279,7 +280,7 @@ public Template addTemplate(String templateText)
             var template = new Template(templateName, description, provider, TemplateType.CUSTOM);
             bus.publish(
                     MessagingServer.class.getName(),
-                    new Notification(EVENT_TEMPLATE_CREATED, template));
+                    new Notification(EVENT_TEMPLATE_CREATED, Map.of("template", template)));
             return template;
         } catch (IOException ioe) {
             // FIXME InvalidXmlException constructor should be made public in -core
@@ -290,6 +291,20 @@ public Template addTemplate(String templateText)
         }
     }
 
+    @Blocking
+    void removeTemplate(String templateName) {
+        var req =
+                DeleteObjectRequest.builder()
+                        .bucket(eventTemplatesBucket)
+                        .key(templateName)
+                        .build();
+        storage.deleteObject(req);
+        bus.publish(
+                MessagingServer.class.getName(),
+                new Notification(
+                        EVENT_TEMPLATE_DELETED, Map.of("template", Map.of("name", templateName))));
+    }
+
     private Tagging createTemplateTagging(
             String templateName, String description, String provider) {
         var map = Map.of("label", templateName, "description", description, "provider", provider);

From e0ee5cbd4ef9bdcb7b6144954c9c29a124bd2952 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 13:16:54 -0500
Subject: [PATCH 24/44] v1 endpoints redirect to v3

---
 .../io/cryostat/events/EventTemplates.java    | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index e6105359e..b94dd2db3 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -73,8 +73,17 @@ public Response listTemplatesV1(@RestPath URI connectUrl) throws Exception {
     @Blocking
     @Path("/api/v1/templates")
     @RolesAllowed("write")
-    public Uni<Void> postTemplatesV1(@RestForm("template") FileUpload body) {
-        // FIXME this should redirect to a POST /api/v3/event_templates
+    public Response postTemplatesV1(@RestForm("template") FileUpload body) {
+        return Response.status(RestResponse.Status.PERMANENT_REDIRECT)
+                .location(URI.create("/api/v3/event_templates"))
+                .build();
+    }
+
+    @POST
+    @Blocking
+    @Path("/api/v3/event_templates")
+    @RolesAllowed("write")
+    public Uni<Void> postTemplates(@RestForm("template") FileUpload body) {
         CompletableFuture<Void> cf = new CompletableFuture<>();
         var path = body.filePath();
         vertx.fileSystem()
@@ -100,7 +109,16 @@ public Uni<Void> postTemplatesV1(@RestForm("template") FileUpload body) {
     @DELETE
     @Path("/api/v1/templates/{templateName}")
     @RolesAllowed("write")
-    public void deleteTemplatesV1(@RestPath String templateName) {
+    public Response deleteTemplatesV1(@RestPath String templateName) {
+        return Response.status(RestResponse.Status.PERMANENT_REDIRECT)
+                .location(URI.create(String.format("/api/v3/event_templates/%s", templateName)))
+                .build();
+    }
+
+    @DELETE
+    @Path("/api/v3/event_templates/{templateName}")
+    @RolesAllowed("write")
+    public void deleteTemplates(@RestPath String templateName) {
         customTemplateService.removeTemplate(templateName);
     }
 

From cc62a178dbc7a25384b1076ad1fbe6b5e21f4505 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 14:05:42 -0500
Subject: [PATCH 25/44] implement more suitable interface

---
 .../java/io/cryostat/events/EventTemplates.java     | 11 ++++++++---
 .../java/io/cryostat/events/S3TemplateService.java  | 13 +++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index b94dd2db3..951ed86a6 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -15,7 +15,9 @@
  */
 package io.cryostat.events;
 
+import java.io.ByteArrayInputStream;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -90,8 +92,11 @@ public Uni<Void> postTemplates(@RestForm("template") FileUpload body) {
                 .readFile(path.toString())
                 .onComplete(
                         ar -> {
-                            try {
-                                customTemplateService.addTemplate(ar.result().toString());
+                            var str = ar.result().toString();
+                            try (var stream =
+                                    new ByteArrayInputStream(
+                                            str.getBytes(StandardCharsets.UTF_8))) {
+                                customTemplateService.addTemplate(stream);
                                 cf.complete(null);
                             } catch (Exception e) {
                                 logger.error(e);
@@ -119,7 +124,7 @@ public Response deleteTemplatesV1(@RestPath String templateName) {
     @Path("/api/v3/event_templates/{templateName}")
     @RolesAllowed("write")
     public void deleteTemplates(@RestPath String templateName) {
-        customTemplateService.removeTemplate(templateName);
+        customTemplateService.deleteTemplate(templateName);
     }
 
     @GET
diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 5ec123b96..be6683a0c 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -15,7 +15,6 @@
  */
 package io.cryostat.events;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -40,10 +39,10 @@
 import io.cryostat.ConfigProperties;
 import io.cryostat.Producers;
 import io.cryostat.core.FlightRecorderException;
+import io.cryostat.core.templates.MutableTemplateService;
 import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
 import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
 import io.cryostat.core.templates.Template;
-import io.cryostat.core.templates.TemplateService;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.util.HttpStatusCodeIdentifier;
 import io.cryostat.ws.MessagingServer;
@@ -78,7 +77,7 @@
 import software.amazon.awssdk.services.s3.model.Tagging;
 
 @ApplicationScoped
-class S3TemplateService implements TemplateService {
+class S3TemplateService implements MutableTemplateService {
 
     static final String EVENT_TEMPLATE_CREATED = "TemplateUploaded";
     static final String EVENT_TEMPLATE_DELETED = "TemplateDeleted";
@@ -240,9 +239,10 @@ private XMLModel parseXml(InputStream inputStream) throws IOException, ParseExce
     }
 
     @Blocking
-    Template addTemplate(String templateText)
+    @Override
+    public Template addTemplate(InputStream stream)
             throws InvalidXmlException, InvalidEventTemplateException, IOException {
-        try (var stream = new ByteArrayInputStream(templateText.getBytes(StandardCharsets.UTF_8))) {
+        try (stream) {
             XMLModel model = parseXml(stream);
 
             XMLTagInstance configuration = model.getRoot();
@@ -292,7 +292,8 @@ Template addTemplate(String templateText)
     }
 
     @Blocking
-    void removeTemplate(String templateName) {
+    @Override
+    public void deleteTemplate(String templateName) {
         var req =
                 DeleteObjectRequest.builder()
                         .bucket(eventTemplatesBucket)

From bbdd943fd14848ed838a5a9cc96306fe0be67bae Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 14:19:01 -0500
Subject: [PATCH 26/44] enable retrieval of custom event templates for creating
 recordings

---
 .../io/cryostat/events/S3TemplateService.java |  2 +-
 .../events/TargetTemplateService.java         |  6 +-
 .../cryostat/recordings/RecordingHelper.java  | 94 ++++++++++---------
 3 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index be6683a0c..7613f22b5 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -77,7 +77,7 @@
 import software.amazon.awssdk.services.s3.model.Tagging;
 
 @ApplicationScoped
-class S3TemplateService implements MutableTemplateService {
+public class S3TemplateService implements MutableTemplateService {
 
     static final String EVENT_TEMPLATE_CREATED = "TemplateUploaded";
     static final String EVENT_TEMPLATE_DELETED = "TemplateDeleted";
diff --git a/src/main/java/io/cryostat/events/TargetTemplateService.java b/src/main/java/io/cryostat/events/TargetTemplateService.java
index ba3060e08..12c4dc9c9 100644
--- a/src/main/java/io/cryostat/events/TargetTemplateService.java
+++ b/src/main/java/io/cryostat/events/TargetTemplateService.java
@@ -32,13 +32,13 @@
 import jakarta.inject.Inject;
 import org.jsoup.nodes.Document;
 
-class TargetTemplateService implements TemplateService {
+public class TargetTemplateService implements TemplateService {
 
     @ApplicationScoped
-    static class Factory {
+    public static class Factory {
         @Inject TargetConnectionManager connectionManager;
 
-        TargetTemplateService create(Target target) {
+        public TargetTemplateService create(Target target) {
             return new TargetTemplateService(connectionManager, target);
         }
     }
diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
index fc8ab8454..1a33b5476 100644
--- a/src/main/java/io/cryostat/recordings/RecordingHelper.java
+++ b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -54,8 +54,9 @@
 import io.cryostat.core.net.JFRConnection;
 import io.cryostat.core.sys.Clock;
 import io.cryostat.core.sys.FileSystem;
-import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
+import io.cryostat.events.S3TemplateService;
+import io.cryostat.events.TargetTemplateService;
 import io.cryostat.recordings.ActiveRecording.Listener.ActiveRecordingEvent;
 import io.cryostat.recordings.ActiveRecording.Listener.ArchivedRecordingEvent;
 import io.cryostat.recordings.Recordings.ArchivedRecording;
@@ -117,23 +118,24 @@ public class RecordingHelper {
             Pattern.compile("^template=([\\w]+)(?:,type=([\\w]+))?$");
     public static final String DATASOURCE_FILENAME = "cryostat-analysis.jfr";
 
-    @Inject Logger logger;
+    @Inject S3Client storage;
+
+    @Inject WebClient webClient;
+    @Inject FileSystem fs;
+    @Inject Clock clock;
     @Inject TargetConnectionManager connectionManager;
+    @Inject RemoteRecordingInputStreamFactory remoteRecordingStreamFactory;
     @Inject RecordingOptionsBuilderFactory recordingOptionsBuilderFactory;
     @Inject EventOptionsBuilder.Factory eventOptionsBuilderFactory;
-    @Inject EventBus bus;
-
-    @Inject Clock clock;
+    @Inject TargetTemplateService.Factory targetTemplateServiceFactory;
+    @Inject S3TemplateService customTemplateService;
 
     @Inject
     @Named(Producers.BASE64_URL)
     Base64 base64Url;
 
-    @Inject RemoteRecordingInputStreamFactory remoteRecordingStreamFactory;
-    @Inject S3Client storage;
-    @Inject FileSystem fs;
-
-    @Inject WebClient webClient;
+    @Inject EventBus bus;
+    @Inject Logger logger;
 
     @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_ARCHIVES)
     String archiveBucket;
@@ -199,7 +201,7 @@ public ActiveRecording startRecording(
             throws Exception {
         String recordingName = (String) recordingOptions.get(RecordingOptionsBuilder.KEY_NAME);
         TemplateType preferredTemplateType =
-                getPreferredTemplateType(connection, templateName, templateType);
+                getPreferredTemplateType(target, templateName, templateType);
         getDescriptorByName(connection, recordingName)
                 .ifPresent(
                         previous -> {
@@ -221,7 +223,7 @@ public ActiveRecording startRecording(
                         .getService()
                         .start(
                                 recordingOptions,
-                                enableEvents(connection, templateName, preferredTemplateType));
+                                enableEvents(target, templateName, preferredTemplateType));
 
         Map<String, String> labels = metadata.labels();
         labels.put("template.name", templateName);
@@ -356,54 +358,56 @@ public Pair<String, TemplateType> parseEventSpecifierToTemplate(String eventSpec
         throw new BadRequestException(eventSpecifier);
     }
 
-    private IConstrainedMap<EventOptionID> enableAllEvents(JFRConnection connection)
-            throws Exception {
-        EventOptionsBuilder builder = eventOptionsBuilderFactory.create(connection);
+    private IConstrainedMap<EventOptionID> enableAllEvents(Target target) throws Exception {
+        return connectionManager.executeConnectedTask(
+                target,
+                connection -> {
+                    EventOptionsBuilder builder = eventOptionsBuilderFactory.create(connection);
 
-        for (IEventTypeInfo eventTypeInfo : connection.getService().getAvailableEventTypes()) {
-            builder.addEvent(eventTypeInfo.getEventTypeID().getFullKey(), "enabled", "true");
-        }
+                    for (IEventTypeInfo eventTypeInfo :
+                            connection.getService().getAvailableEventTypes()) {
+                        builder.addEvent(
+                                eventTypeInfo.getEventTypeID().getFullKey(), "enabled", "true");
+                    }
 
-        return builder.build();
+                    return builder.build();
+                });
     }
 
     public IConstrainedMap<EventOptionID> enableEvents(
-            JFRConnection connection, String templateName, TemplateType templateType)
-            throws Exception {
+            Target target, String templateName, TemplateType templateType) throws Exception {
         if (templateName.equals("ALL")) {
-            return enableAllEvents(connection);
+            return enableAllEvents(target);
+        }
+        TemplateType type = getPreferredTemplateType(target, templateName, templateType);
+        switch (type) {
+            case TARGET:
+                return targetTemplateServiceFactory
+                        .create(target)
+                        .getEvents(templateName, type)
+                        .orElseThrow();
+            case CUSTOM:
+                return customTemplateService.getEvents(templateName, templateType).orElseThrow();
+            default:
+                throw new BadRequestException(
+                        String.format("Invalid/unknown event template %s", templateName));
         }
-        // if template type not specified, try to find a Custom template by that name. If none,
-        // fall back on finding a Target built-in template by the name. If not, throw an
-        // exception and bail out.
-        TemplateType type = getPreferredTemplateType(connection, templateName, templateType);
-        return connection.getTemplateService().getEvents(templateName, type).get();
     }
 
     public TemplateType getPreferredTemplateType(
-            JFRConnection connection, String templateName, TemplateType templateType)
-            throws Exception {
+            Target target, String templateName, TemplateType templateType) throws Exception {
+        // if template type not specified, try to find a Custom template by that name. If none,
+        // fall back on finding a Target built-in template by the name. If not, throw an
+        // exception and bail out.
         if (templateType != null) {
             return templateType;
         }
-        if (templateName.equals("ALL")) {
-            // special case for the ALL meta-template
-            return TemplateType.TARGET;
-        }
-        List<Template> matchingNameTemplates =
-                connection.getTemplateService().getTemplates().stream()
-                        .filter(t -> t.getName().equals(templateName))
-                        .toList();
-        boolean custom =
-                matchingNameTemplates.stream()
-                        .anyMatch(t -> t.getType().equals(TemplateType.CUSTOM));
-        if (custom) {
+        if (customTemplateService.getTemplates().stream()
+                .anyMatch(t -> t.getName().equals(templateName))) {
             return TemplateType.CUSTOM;
         }
-        boolean target =
-                matchingNameTemplates.stream()
-                        .anyMatch(t -> t.getType().equals(TemplateType.TARGET));
-        if (target) {
+        if (targetTemplateServiceFactory.create(target).getTemplates().stream()
+                .anyMatch(t -> t.getName().equals(templateName))) {
             return TemplateType.TARGET;
         }
         throw new BadRequestException(

From bbd2df010684fcf8886b4798b26e93ce010792fb Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 14:37:07 -0500
Subject: [PATCH 27/44] update @Blocking methods

---
 src/main/java/io/cryostat/events/EventTemplates.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 951ed86a6..fbe1bfc07 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -72,7 +72,6 @@ public Response listTemplatesV1(@RestPath URI connectUrl) throws Exception {
     }
 
     @POST
-    @Blocking
     @Path("/api/v1/templates")
     @RolesAllowed("write")
     public Response postTemplatesV1(@RestForm("template") FileUpload body) {
@@ -82,7 +81,6 @@ public Response postTemplatesV1(@RestForm("template") FileUpload body) {
     }
 
     @POST
-    @Blocking
     @Path("/api/v3/event_templates")
     @RolesAllowed("write")
     public Uni<Void> postTemplates(@RestForm("template") FileUpload body) {
@@ -121,6 +119,7 @@ public Response deleteTemplatesV1(@RestPath String templateName) {
     }
 
     @DELETE
+    @Blocking
     @Path("/api/v3/event_templates/{templateName}")
     @RolesAllowed("write")
     public void deleteTemplates(@RestPath String templateName) {
@@ -145,6 +144,7 @@ public Response getTargetTemplateV1(
     }
 
     @GET
+    @Blocking
     @Path("/api/v3/event_templates")
     @RolesAllowed("read")
     public List<Template> listTemplates() throws Exception {
@@ -155,6 +155,7 @@ public List<Template> listTemplates() throws Exception {
     }
 
     @GET
+    @Blocking
     @Path("/api/v3/targets/{id}/event_templates")
     @RolesAllowed("read")
     public List<Template> listTargetTemplates(@RestPath long id) throws Exception {
@@ -167,6 +168,7 @@ public List<Template> listTargetTemplates(@RestPath long id) throws Exception {
     }
 
     @GET
+    @Blocking
     @Path("/api/v3/targets/{id}/event_templates/{templateType}/{templateName}")
     @RolesAllowed("read")
     public String getTargetTemplate(

From 890f46c057b903add8d798739b96d5664d775800 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 14:37:21 -0500
Subject: [PATCH 28/44] add API v2.1 redirecting handler

---
 .../java/io/cryostat/events/EventTemplates.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index fbe1bfc07..98639da30 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -143,6 +143,23 @@ public Response getTargetTemplateV1(
                 .build();
     }
 
+    @GET
+    @Path("/api/v2.1/targets/{connectUrl}/templates/{templateName}/type/{templateType}")
+    @RolesAllowed("read")
+    public Response getTargetTemplateV2_1(
+            @RestPath URI connectUrl,
+            @RestPath String templateName,
+            @RestPath TemplateType templateType) {
+        Target target = Target.getTargetByConnectUrl(connectUrl);
+        return Response.status(RestResponse.Status.PERMANENT_REDIRECT)
+                .location(
+                        URI.create(
+                                String.format(
+                                        "/api/v3/targets/%d/event_templates/%s/%s",
+                                        target.id, templateType, templateName)))
+                .build();
+    }
+
     @GET
     @Blocking
     @Path("/api/v3/event_templates")

From 01cc8ff41903bd7332577d3a9b1f7a182f242d99 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 14:59:31 -0500
Subject: [PATCH 29/44] disable/remove tests

---
 .../java/io/cryostat/CustomEventTemplate.java | 59 -------------------
 src/test/java/itest/TemplatePostDeleteIT.java |  8 +--
 2 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 src/test/java/io/cryostat/CustomEventTemplate.java

diff --git a/src/test/java/io/cryostat/CustomEventTemplate.java b/src/test/java/io/cryostat/CustomEventTemplate.java
deleted file mode 100644
index 898a24eb4..000000000
--- a/src/test/java/io/cryostat/CustomEventTemplate.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright The Cryostat Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cryostat;
-
-import static io.restassured.RestAssured.when;
-
-import io.cryostat.core.templates.Template;
-import io.cryostat.core.templates.TemplateType;
-
-import jakarta.transaction.Transactional;
-import org.junit.Test;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-
-public class CustomEventTemplate {
-
-    Template template;
-
-    static String TEMPLATE_NAME = "customEventTemplate";
-
-    @BeforeEach
-    public void setup() {
-        template = new Template(TEMPLATE_NAME, "desc", "prov", TemplateType.CUSTOM);
-    }
-
-    @AfterEach
-    @Transactional
-    public void afterEach() {
-        // template.deleteAll();
-    }
-
-    @Test
-    public void testCustomEventTemplate() {
-        when().get().then().statusCode(200);
-    }
-
-    @Test
-    public void testCustom() {
-        // givenBasicAuth()
-        //         .body()
-        //         .contentType(ContentType.APPLICATION_XML)
-        //         .post()
-        //         .then()
-        //         .statusCode(200);
-    }
-}
diff --git a/src/test/java/itest/TemplatePostDeleteIT.java b/src/test/java/itest/TemplatePostDeleteIT.java
index df35d3c6b..b7cb509dd 100644
--- a/src/test/java/itest/TemplatePostDeleteIT.java
+++ b/src/test/java/itest/TemplatePostDeleteIT.java
@@ -28,10 +28,11 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @QuarkusIntegrationTest
-// @Disabled("TODO")
+@Disabled("TODO")
 public class TemplatePostDeleteIT extends StandardSelfTest {
     static final String INVALID_TEMPLATE_FILE_NAME = "invalidTemplate.xml";
     static final String SANITIZE_TEMPLATE_FILE_NAME = "TemplateToSanitize.jfc";
@@ -56,7 +57,6 @@ public void shouldThrowIfTemplateUploadNameInvalid() throws Exception {
 
         webClient
                 .post(REQ_URL)
-                .basicAuthentication("user", "pass")
                 .sendMultipartForm(
                         form,
                         ar -> {
@@ -86,7 +86,6 @@ public void shouldThrowWhenPostingInvalidTemplate() throws Exception {
 
         webClient
                 .post(REQ_URL)
-                .basicAuthentication("user", "pass")
                 .sendMultipartForm(
                         form,
                         ar -> {
@@ -106,7 +105,6 @@ public void testDeleteRecordingThrowsOnNonExistentTemplate() throws Exception {
 
         webClient
                 .delete(String.format("%s/%s", REQ_URL, INVALID_TEMPLATE_FILE_NAME))
-                .basicAuthentication("user", "pass")
                 .send(
                         ar -> {
                             assertRequestStatus(ar, response);
@@ -144,7 +142,6 @@ public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
             CompletableFuture<JsonArray> getResponse = new CompletableFuture<>();
             webClient
                     .get("/api/v1/targets/localhost:0/templates")
-                    .basicAuthentication("user", "pass")
                     .send(
                             ar -> {
                                 assertRequestStatus(ar, getResponse);
@@ -163,7 +160,6 @@ public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
             CompletableFuture<Integer> deleteResponse = new CompletableFuture<>();
             webClient
                     .delete(REQ_URL + "/Template_To_Sanitize")
-                    .basicAuthentication("user", "pass")
                     .send(
                             ar -> {
                                 assertRequestStatus(ar, deleteResponse);

From 7ed224835b7dccbbd59a24e99a7b413b9eaf6124 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 15:15:37 -0500
Subject: [PATCH 30/44] fixup! disable/remove tests

---
 src/test/java/itest/TemplatePostDeleteIT.java |  16 +-
 src/test/resources/TemplateToSanitize.jfc     | 847 ++++++++++++++++++
 2 files changed, 860 insertions(+), 3 deletions(-)
 create mode 100644 src/test/resources/TemplateToSanitize.jfc

diff --git a/src/test/java/itest/TemplatePostDeleteIT.java b/src/test/java/itest/TemplatePostDeleteIT.java
index b7cb509dd..bc17e83e7 100644
--- a/src/test/java/itest/TemplatePostDeleteIT.java
+++ b/src/test/java/itest/TemplatePostDeleteIT.java
@@ -19,7 +19,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-import io.quarkus.test.junit.QuarkusIntegrationTest;
+import io.quarkus.test.junit.QuarkusTest;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.handler.HttpException;
@@ -31,9 +31,10 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@QuarkusIntegrationTest
+@QuarkusTest
 @Disabled("TODO")
 public class TemplatePostDeleteIT extends StandardSelfTest {
+
     static final String INVALID_TEMPLATE_FILE_NAME = "invalidTemplate.xml";
     static final String SANITIZE_TEMPLATE_FILE_NAME = "TemplateToSanitize.jfc";
     static final String TEMPLATE_NAME = "invalidTemplate";
@@ -57,6 +58,7 @@ public void shouldThrowIfTemplateUploadNameInvalid() throws Exception {
 
         webClient
                 .post(REQ_URL)
+                .followRedirects(true)
                 .sendMultipartForm(
                         form,
                         ar -> {
@@ -86,6 +88,7 @@ public void shouldThrowWhenPostingInvalidTemplate() throws Exception {
 
         webClient
                 .post(REQ_URL)
+                .followRedirects(true)
                 .sendMultipartForm(
                         form,
                         ar -> {
@@ -105,6 +108,7 @@ public void testDeleteRecordingThrowsOnNonExistentTemplate() throws Exception {
 
         webClient
                 .delete(String.format("%s/%s", REQ_URL, INVALID_TEMPLATE_FILE_NAME))
+                .followRedirects(true)
                 .send(
                         ar -> {
                             assertRequestStatus(ar, response);
@@ -131,6 +135,7 @@ public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
                                     "template", SANITIZE_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
             webClient
                     .post(REQ_URL)
+                    .followRedirects(true)
                     .sendMultipartForm(
                             form,
                             ar -> {
@@ -141,7 +146,11 @@ public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
 
             CompletableFuture<JsonArray> getResponse = new CompletableFuture<>();
             webClient
-                    .get("/api/v1/targets/localhost:0/templates")
+                    .get(
+                            String.format(
+                                    "/api/v1/targets/%s/templates",
+                                    getSelfReferenceConnectUrlEncoded()))
+                    .followRedirects(true)
                     .send(
                             ar -> {
                                 assertRequestStatus(ar, getResponse);
@@ -160,6 +169,7 @@ public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
             CompletableFuture<Integer> deleteResponse = new CompletableFuture<>();
             webClient
                     .delete(REQ_URL + "/Template_To_Sanitize")
+                    .followRedirects(true)
                     .send(
                             ar -> {
                                 assertRequestStatus(ar, deleteResponse);
diff --git a/src/test/resources/TemplateToSanitize.jfc b/src/test/resources/TemplateToSanitize.jfc
new file mode 100644
index 000000000..320bd07dd
--- /dev/null
+++ b/src/test/resources/TemplateToSanitize.jfc
@@ -0,0 +1,847 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+     Recommended way to edit .jfc files is to use Java Mission Control,
+     see Window -> Flight Recorder Template Manager.
+-->
+
+<configuration version="2.0" label="Template To Sanitize" description="Template with multiple words in label/name" provider="Cryostat">
+
+    <event name="jdk.ThreadAllocationStatistics">
+      <setting name="enabled">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.ClassLoadingStatistics">
+      <setting name="enabled">true</setting>
+      <setting name="period">1000 ms</setting>
+    </event>
+
+    <event name="jdk.ClassLoaderStatistics">
+      <setting name="enabled">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.JavaThreadStatistics">
+      <setting name="enabled">true</setting>
+      <setting name="period">1000 ms</setting>
+    </event>
+
+    <event name="jdk.ThreadStart">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.ThreadEnd">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.ThreadSleep">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="synchronization-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.ThreadPark">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="synchronization-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.JavaMonitorEnter">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="synchronization-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.JavaMonitorWait">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="synchronization-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.JavaMonitorInflate">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="synchronization-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.BiasedLockRevocation">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.BiasedLockSelfRevocation">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.BiasedLockClassRevocation">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.ReservedStackActivation">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.ClassLoad">
+      <setting name="enabled" control="class-loading-enabled">false</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.ClassDefine">
+      <setting name="enabled" control="class-loading-enabled">false</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.ClassUnload">
+      <setting name="enabled" control="class-loading-enabled">false</setting>
+    </event>
+
+    <event name="jdk.JVMInformation">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.InitialSystemProperty">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.ExecutionSample">
+      <setting name="enabled" control="method-sampling-enabled">true</setting>
+      <setting name="period" control="method-sampling-interval">10 ms</setting>
+    </event>
+
+    <event name="jdk.NativeMethodSample">
+      <setting name="enabled" control="method-sampling-enabled">true</setting>
+      <setting name="period" control="method-sampling-interval">10 ms</setting>
+    </event>
+
+    <event name="jdk.SafepointBegin">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.SafepointStateSynchronization">
+      <setting name="enabled">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.SafepointWaitBlocked">
+      <setting name="enabled">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.SafepointCleanup">
+      <setting name="enabled">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.SafepointCleanupTask">
+      <setting name="enabled">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.SafepointEnd">
+      <setting name="enabled">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.ExecuteVMOperation">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.Shutdown">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.ThreadDump">
+      <setting name="enabled" control="thread-dump-enabled">true</setting>
+      <setting name="period" control="thread-dump-interval">60 s</setting>
+    </event>
+
+    <event name="jdk.IntFlag">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.UnsignedIntFlag">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.LongFlag">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.UnsignedLongFlag">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.DoubleFlag">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.BooleanFlag">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.StringFlag">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.IntFlagChanged">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.UnsignedIntFlagChanged">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.LongFlagChanged">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.UnsignedLongFlagChanged">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.DoubleFlagChanged">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.BooleanFlagChanged">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.StringFlagChanged">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.ObjectCount">
+      <setting name="enabled" control="memory-profiling-enabled-all">false</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.GCConfiguration">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.GCHeapConfiguration">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.YoungGenerationConfiguration">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.GCTLABConfiguration">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.GCSurvivorConfiguration">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.ObjectCountAfterGC">
+      <setting name="enabled">false</setting>
+    </event>
+
+    <event name="jdk.GCHeapSummary">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.PSHeapSummary">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.G1HeapSummary">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.MetaspaceSummary">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.MetaspaceGCThreshold">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.MetaspaceAllocationFailure">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.MetaspaceOOM">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.MetaspaceChunkFreeListSummary">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.GarbageCollection">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.ParallelOldGarbageCollection">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.YoungGarbageCollection">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.OldGarbageCollection">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.G1GarbageCollection">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.GCPhasePause">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.GCPhasePauseLevel1">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.GCPhasePauseLevel2">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.GCPhasePauseLevel3">
+      <setting name="enabled" control="gc-enabled-all">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.GCPhasePauseLevel4">
+      <setting name="enabled" control="gc-enabled-all">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.GCPhaseConcurrent">
+      <setting name="enabled" control="gc-enabled-all">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.GCReferenceStatistics">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.PromotionFailed">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.EvacuationFailed">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.EvacuationInformation">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.G1MMU">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.G1EvacuationYoungStatistics">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.G1EvacuationOldStatistics">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.G1BasicIHOP">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.G1AdaptiveIHOP">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.PromoteObjectInNewPLAB">
+      <setting name="enabled" control="memory-profiling-enabled-medium">true</setting>
+    </event>
+
+    <event name="jdk.PromoteObjectOutsidePLAB">
+      <setting name="enabled" control="memory-profiling-enabled-medium">true</setting>
+    </event>
+
+    <event name="jdk.ConcurrentModeFailure">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.AllocationRequiringGC">
+      <setting name="enabled" control="gc-enabled-all">false</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.TenuringDistribution">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+    </event>
+
+    <event name="jdk.G1HeapRegionInformation">
+      <setting name="enabled" control="gc-enabled-all">false</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.G1HeapRegionTypeChange">
+      <setting name="enabled" control="gc-enabled-all">false</setting>
+    </event>
+
+    <event name="jdk.OldObjectSample">
+      <setting name="enabled" control="memory-leak-detection-enabled">true</setting>
+      <setting name="stackTrace" control="memory-leak-detection-stack-trace">true</setting>
+      <setting name="cutoff" control="memory-leak-detection-cutoff">0 ns</setting>
+    </event>
+
+    <event name="jdk.CompilerConfiguration">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.CompilerStatistics">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="period">1000 ms</setting>
+    </event>
+
+    <event name="jdk.Compilation">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="threshold" control="compiler-compilation-threshold">100 ms</setting>
+    </event>
+
+    <event name="jdk.CompilerPhase">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="threshold" control="compiler-phase-threshold">10 s</setting>
+    </event>
+
+    <event name="jdk.CompilationFailure">
+      <setting name="enabled" control="compiler-enabled-failure">true</setting>
+    </event>
+
+    <event name="jdk.CompilerInlining">
+      <setting name="enabled" control="compiler-enabled-failure">false</setting>
+    </event>
+
+    <event name="jdk.CodeSweeperConfiguration">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.CodeSweeperStatistics">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.SweepCodeCache">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="threshold" control="compiler-sweeper-threshold">100 ms</setting>
+    </event>
+
+    <event name="jdk.CodeCacheConfiguration">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.CodeCacheStatistics">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.CodeCacheFull">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+    </event>
+
+    <event name="jdk.OSInformation">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.CPUInformation">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.ThreadContextSwitchRate">
+      <setting name="enabled" control="compiler-enabled">true</setting>
+      <setting name="period">10 s</setting>
+    </event>
+
+    <event name="jdk.CPULoad">
+      <setting name="enabled">true</setting>
+      <setting name="period">1000 ms</setting>
+    </event>
+
+    <event name="jdk.ThreadCPULoad">
+      <setting name="enabled">true</setting>
+      <setting name="period">10 s</setting>
+    </event>
+
+    <event name="jdk.CPUTimeStampCounter">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.SystemProcess">
+      <setting name="enabled">true</setting>
+      <setting name="period">endChunk</setting>
+    </event>
+
+    <event name="jdk.NetworkUtilization">
+      <setting name="enabled">true</setting>
+      <setting name="period">5 s</setting>
+    </event>
+
+    <event name="jdk.InitialEnvironmentVariable">
+      <setting name="enabled">true</setting>
+      <setting name="period">beginChunk</setting>
+    </event>
+
+    <event name="jdk.PhysicalMemory">
+      <setting name="enabled">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.ObjectAllocationInNewTLAB">
+      <setting name="enabled" control="memory-profiling-enabled-medium">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.ObjectAllocationOutsideTLAB">
+      <setting name="enabled" control="memory-profiling-enabled-medium">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.NativeLibrary">
+      <setting name="enabled">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
+    <event name="jdk.ModuleRequire">
+      <setting name="enabled">true</setting>
+      <setting name="period">endChunk</setting>
+    </event>
+
+    <event name="jdk.ModuleExport">
+      <setting name="enabled">true</setting>
+      <setting name="period">endChunk</setting>
+    </event>
+
+    <event name="jdk.FileForce">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="file-io-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.FileRead">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="file-io-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.FileWrite">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="file-io-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.SocketRead">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="socket-io-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.SocketWrite">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold" control="socket-io-threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.SecurityPropertyModification">
+       <setting name="enabled">false</setting>
+       <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.TLSHandshake">
+      <setting name="enabled">false</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.X509Validation">
+       <setting name="enabled">false</setting>
+       <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.X509Certificate">
+       <setting name="enabled">false</setting>
+       <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.JavaExceptionThrow">
+      <setting name="enabled" control="enable-exceptions">false</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.JavaErrorThrow">
+      <setting name="enabled" control="enable-errors">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.ExceptionStatistics">
+      <setting name="enabled">true</setting>
+      <setting name="period">1000 ms</setting>
+    </event>
+
+    <event name="jdk.ActiveRecording">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.ActiveSetting">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.DataLoss">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.DumpReason">
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.ZPageAllocation">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">10 ms</setting>
+    </event>
+
+    <event name="jdk.ZThreadPhase">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.ZStatisticsCounter">
+      <setting name="threshold">10 ms</setting>
+      <setting name="enabled">true</setting>
+    </event>
+
+    <event name="jdk.ZStatisticsSampler">
+      <setting name="enabled">true</setting>
+      <setting name="threshold">10 ms</setting>
+    </event>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <!--
+         Contents of the control element is not read by the JVM, it's used
+         by Java Mission Control to change settings that carry the control attribute.
+    -->
+    <control>
+
+      <selection name="gc-level" default="detailed" label="Garbage Collector">
+        <option label="Off" name="off">off</option>
+        <option label="Normal" name="detailed">normal</option>
+        <option label="All" name="all">all</option>
+      </selection>
+
+      <condition name="gc-enabled-normal" true="true" false="false">
+        <or>
+          <test name="gc-level" operator="equal" value="normal" />
+          <test name="gc-level" operator="equal" value="all" />
+        </or>
+      </condition>
+
+      <condition name="gc-enabled-all" true="true" false="false">
+        <test name="gc-level" operator="equal" value="all" />
+      </condition>
+
+      <selection name="memory-profiling" default="medium" label="Memory Profiling">
+        <option label="Off" name="off">off</option>
+        <option label="Object Allocation and Promotion" name="medium">medium</option>
+        <option label="All, including Heap Statistics (May cause long full GCs)" name="all">all</option>
+      </selection>
+
+      <condition name="memory-profiling-enabled-medium" true="true" false="false">
+        <or>
+          <test name="memory-profiling" operator="equal" value="medium" />
+          <test name="memory-profiling" operator="equal" value="all" />
+        </or>
+      </condition>
+
+      <condition name="memory-profiling-enabled-all" true="true" false="false">
+        <test name="memory-profiling" operator="equal" value="all" />
+      </condition>
+
+      <selection name="compiler-level" default="detailed" label="Compiler">
+        <option label="Off" name="off">off</option>
+        <option label="Normal" name="normal">normal</option>
+        <option label="Detailed" name="detailed">detailed</option>
+        <option label="All" name="all">all</option>
+      </selection>
+
+      <condition name="compiler-enabled" true="false" false="true">
+        <test name="compiler-level" operator="equal" value="off" />
+      </condition>
+
+      <condition name="compiler-enabled-failure" true="true" false="false">
+        <or>
+          <test name="compiler-level" operator="equal" value="detailed" />
+          <test name="compiler-level" operator="equal" value="all" />
+        </or>
+      </condition>
+
+      <condition name="compiler-sweeper-threshold" true="0 ms" false="100 ms">
+        <test name="compiler-level" operator="equal" value="all" />
+      </condition>
+
+      <condition name="compiler-compilation-threshold" true="1000 ms">
+        <test name="compiler-level" operator="equal" value="normal" />
+      </condition>
+
+      <condition name="compiler-compilation-threshold" true="100 ms">
+        <test name="compiler-level" operator="equal" value="detailed" />
+      </condition>
+
+      <condition name="compiler-compilation-threshold" true="0 ms">
+        <test name="compiler-level" operator="equal" value="all" />
+      </condition>
+
+      <condition name="compiler-phase-threshold" true="60 s">
+        <test name="compiler-level" operator="equal" value="normal" />
+      </condition>
+
+      <condition name="compiler-phase-threshold" true="10 s">
+        <test name="compiler-level" operator="equal" value="detailed" />
+      </condition>
+
+      <condition name="compiler-phase-threshold" true="0 s">
+        <test name="compiler-level" operator="equal" value="all" />
+      </condition>
+
+      <selection name="method-sampling-interval" default="maximum" label="Method Sampling">
+        <option label="Off" name="off">999 d</option>
+        <option label="Normal" name="normal">20 ms</option>
+        <option label="Maximum" name="maximum">10 ms</option>
+      </selection>
+
+      <condition name="method-sampling-enabled" true="false" false="true">
+        <test name="method-sampling-interval" operator="equal" value="999 d" />
+      </condition>
+
+      <selection name="thread-dump-interval" default="everyMinute" label="Thread Dump">
+        <option label="Off" name="off">999 d</option>
+        <option label="At least Once" name="normal">everyChunk</option>
+        <option label="Every 60 s" name="everyMinute">60 s</option>
+        <option label="Every 10 s" name="everyTenSecond">10 s</option>
+        <option label="Every 1 s" name="everySecond">1 s</option>
+      </selection>
+
+      <condition name="thread-dump-enabled" true="false" false="true">
+        <test name="thread-dump-interval" operator="equal" value="999 d" />
+      </condition>
+
+      <selection name="exception-level" default="errors" label="Exceptions">
+        <option label="Off" name="off">off</option>
+        <option label="Errors Only" name="errors">errors</option>
+        <option label="All Exceptions, including Errors" name="all">all</option>
+      </selection>
+
+      <condition name="enable-errors" true="true" false="false">
+        <or>
+          <test name="exception-level" operator="equal" value="errors" />
+          <test name="exception-level" operator="equal" value="all" />
+        </or>
+      </condition>
+
+      <condition name="enable-exceptions" true="true" false="false">
+        <test name="exception-level" operator="equal" value="all" />
+      </condition>
+
+      <selection name="memory-leak-detection" default="medium" label="Memory Leak Detection">
+        <option label="Off" name="off">off</option>
+        <option label="Object Types" name="minimal">minimal</option>
+        <option label="Object Types + Allocation Stack Traces" name="medium">medium</option>
+        <option label="Object Types + Allocation Stack Traces + Path to GC Root" name="full">full</option>
+      </selection>
+
+      <condition name="memory-leak-detection-enabled" true="false" false="true">
+        <test name="memory-leak-detection" operator="equal" value="off" />
+      </condition>
+
+      <condition name="memory-leak-detection-stack-trace" true="true" false="false">
+        <or>
+          <test name="memory-leak-detection" operator="equal" value="medium" />
+          <test name="memory-leak-detection" operator="equal" value="full" />
+        </or>
+      </condition>
+
+      <condition name="memory-leak-detection-cutoff" true="1 h" false="0 ns">
+        <test name="memory-leak-detection" operator="equal" value="full" />
+      </condition>
+
+      <text name="synchronization-threshold" label="Synchronization Threshold" contentType="timespan" minimum="0 s">10 ms</text>
+
+      <text name="file-io-threshold" label="File I/O Threshold" contentType="timespan" minimum="0 s">10 ms</text>
+
+      <text name="socket-io-threshold" label="Socket I/O Threshold" contentType="timespan" minimum="0 s">10 ms</text>
+
+      <flag name="class-loading-enabled" label="Class Loading">false</flag>
+
+    </control>
+
+</configuration>

From 774095d07e15616be6636c2fa388c0dec904b736 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 15:45:41 -0500
Subject: [PATCH 31/44] Revert "enable retrieval of custom event templates for
 creating recordings"

This reverts commit ab40d5f22c01f01c8695c0a6b4668138ab91da40.
---
 .../io/cryostat/events/S3TemplateService.java |  2 +-
 .../events/TargetTemplateService.java         |  6 +-
 .../cryostat/recordings/RecordingHelper.java  | 94 +++++++++----------
 3 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 7613f22b5..be6683a0c 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -77,7 +77,7 @@
 import software.amazon.awssdk.services.s3.model.Tagging;
 
 @ApplicationScoped
-public class S3TemplateService implements MutableTemplateService {
+class S3TemplateService implements MutableTemplateService {
 
     static final String EVENT_TEMPLATE_CREATED = "TemplateUploaded";
     static final String EVENT_TEMPLATE_DELETED = "TemplateDeleted";
diff --git a/src/main/java/io/cryostat/events/TargetTemplateService.java b/src/main/java/io/cryostat/events/TargetTemplateService.java
index 12c4dc9c9..ba3060e08 100644
--- a/src/main/java/io/cryostat/events/TargetTemplateService.java
+++ b/src/main/java/io/cryostat/events/TargetTemplateService.java
@@ -32,13 +32,13 @@
 import jakarta.inject.Inject;
 import org.jsoup.nodes.Document;
 
-public class TargetTemplateService implements TemplateService {
+class TargetTemplateService implements TemplateService {
 
     @ApplicationScoped
-    public static class Factory {
+    static class Factory {
         @Inject TargetConnectionManager connectionManager;
 
-        public TargetTemplateService create(Target target) {
+        TargetTemplateService create(Target target) {
             return new TargetTemplateService(connectionManager, target);
         }
     }
diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
index 1a33b5476..fc8ab8454 100644
--- a/src/main/java/io/cryostat/recordings/RecordingHelper.java
+++ b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -54,9 +54,8 @@
 import io.cryostat.core.net.JFRConnection;
 import io.cryostat.core.sys.Clock;
 import io.cryostat.core.sys.FileSystem;
+import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
-import io.cryostat.events.S3TemplateService;
-import io.cryostat.events.TargetTemplateService;
 import io.cryostat.recordings.ActiveRecording.Listener.ActiveRecordingEvent;
 import io.cryostat.recordings.ActiveRecording.Listener.ArchivedRecordingEvent;
 import io.cryostat.recordings.Recordings.ArchivedRecording;
@@ -118,24 +117,23 @@ public class RecordingHelper {
             Pattern.compile("^template=([\\w]+)(?:,type=([\\w]+))?$");
     public static final String DATASOURCE_FILENAME = "cryostat-analysis.jfr";
 
-    @Inject S3Client storage;
-
-    @Inject WebClient webClient;
-    @Inject FileSystem fs;
-    @Inject Clock clock;
+    @Inject Logger logger;
     @Inject TargetConnectionManager connectionManager;
-    @Inject RemoteRecordingInputStreamFactory remoteRecordingStreamFactory;
     @Inject RecordingOptionsBuilderFactory recordingOptionsBuilderFactory;
     @Inject EventOptionsBuilder.Factory eventOptionsBuilderFactory;
-    @Inject TargetTemplateService.Factory targetTemplateServiceFactory;
-    @Inject S3TemplateService customTemplateService;
+    @Inject EventBus bus;
+
+    @Inject Clock clock;
 
     @Inject
     @Named(Producers.BASE64_URL)
     Base64 base64Url;
 
-    @Inject EventBus bus;
-    @Inject Logger logger;
+    @Inject RemoteRecordingInputStreamFactory remoteRecordingStreamFactory;
+    @Inject S3Client storage;
+    @Inject FileSystem fs;
+
+    @Inject WebClient webClient;
 
     @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_ARCHIVES)
     String archiveBucket;
@@ -201,7 +199,7 @@ public ActiveRecording startRecording(
             throws Exception {
         String recordingName = (String) recordingOptions.get(RecordingOptionsBuilder.KEY_NAME);
         TemplateType preferredTemplateType =
-                getPreferredTemplateType(target, templateName, templateType);
+                getPreferredTemplateType(connection, templateName, templateType);
         getDescriptorByName(connection, recordingName)
                 .ifPresent(
                         previous -> {
@@ -223,7 +221,7 @@ public ActiveRecording startRecording(
                         .getService()
                         .start(
                                 recordingOptions,
-                                enableEvents(target, templateName, preferredTemplateType));
+                                enableEvents(connection, templateName, preferredTemplateType));
 
         Map<String, String> labels = metadata.labels();
         labels.put("template.name", templateName);
@@ -358,56 +356,54 @@ public Pair<String, TemplateType> parseEventSpecifierToTemplate(String eventSpec
         throw new BadRequestException(eventSpecifier);
     }
 
-    private IConstrainedMap<EventOptionID> enableAllEvents(Target target) throws Exception {
-        return connectionManager.executeConnectedTask(
-                target,
-                connection -> {
-                    EventOptionsBuilder builder = eventOptionsBuilderFactory.create(connection);
+    private IConstrainedMap<EventOptionID> enableAllEvents(JFRConnection connection)
+            throws Exception {
+        EventOptionsBuilder builder = eventOptionsBuilderFactory.create(connection);
 
-                    for (IEventTypeInfo eventTypeInfo :
-                            connection.getService().getAvailableEventTypes()) {
-                        builder.addEvent(
-                                eventTypeInfo.getEventTypeID().getFullKey(), "enabled", "true");
-                    }
+        for (IEventTypeInfo eventTypeInfo : connection.getService().getAvailableEventTypes()) {
+            builder.addEvent(eventTypeInfo.getEventTypeID().getFullKey(), "enabled", "true");
+        }
 
-                    return builder.build();
-                });
+        return builder.build();
     }
 
     public IConstrainedMap<EventOptionID> enableEvents(
-            Target target, String templateName, TemplateType templateType) throws Exception {
+            JFRConnection connection, String templateName, TemplateType templateType)
+            throws Exception {
         if (templateName.equals("ALL")) {
-            return enableAllEvents(target);
+            return enableAllEvents(connection);
         }
-        TemplateType type = getPreferredTemplateType(target, templateName, templateType);
-        switch (type) {
-            case TARGET:
-                return targetTemplateServiceFactory
-                        .create(target)
-                        .getEvents(templateName, type)
-                        .orElseThrow();
-            case CUSTOM:
-                return customTemplateService.getEvents(templateName, templateType).orElseThrow();
-            default:
-                throw new BadRequestException(
-                        String.format("Invalid/unknown event template %s", templateName));
-        }
-    }
-
-    public TemplateType getPreferredTemplateType(
-            Target target, String templateName, TemplateType templateType) throws Exception {
         // if template type not specified, try to find a Custom template by that name. If none,
         // fall back on finding a Target built-in template by the name. If not, throw an
         // exception and bail out.
+        TemplateType type = getPreferredTemplateType(connection, templateName, templateType);
+        return connection.getTemplateService().getEvents(templateName, type).get();
+    }
+
+    public TemplateType getPreferredTemplateType(
+            JFRConnection connection, String templateName, TemplateType templateType)
+            throws Exception {
         if (templateType != null) {
             return templateType;
         }
-        if (customTemplateService.getTemplates().stream()
-                .anyMatch(t -> t.getName().equals(templateName))) {
+        if (templateName.equals("ALL")) {
+            // special case for the ALL meta-template
+            return TemplateType.TARGET;
+        }
+        List<Template> matchingNameTemplates =
+                connection.getTemplateService().getTemplates().stream()
+                        .filter(t -> t.getName().equals(templateName))
+                        .toList();
+        boolean custom =
+                matchingNameTemplates.stream()
+                        .anyMatch(t -> t.getType().equals(TemplateType.CUSTOM));
+        if (custom) {
             return TemplateType.CUSTOM;
         }
-        if (targetTemplateServiceFactory.create(target).getTemplates().stream()
-                .anyMatch(t -> t.getName().equals(templateName))) {
+        boolean target =
+                matchingNameTemplates.stream()
+                        .anyMatch(t -> t.getType().equals(TemplateType.TARGET));
+        if (target) {
             return TemplateType.TARGET;
         }
         throw new BadRequestException(

From 6accdfd846ff72bd02cf352f89809588e081a3d5 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 15:49:39 -0500
Subject: [PATCH 32/44] Reapply "enable retrieval of custom event templates for
 creating recordings"

This reverts commit 5963d0062342e0b8d2cf6f3f05a5f737cea868fd.
---
 .../io/cryostat/events/S3TemplateService.java |  2 +-
 .../events/TargetTemplateService.java         |  6 +-
 .../cryostat/recordings/RecordingHelper.java  | 94 ++++++++++---------
 3 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index be6683a0c..7613f22b5 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -77,7 +77,7 @@
 import software.amazon.awssdk.services.s3.model.Tagging;
 
 @ApplicationScoped
-class S3TemplateService implements MutableTemplateService {
+public class S3TemplateService implements MutableTemplateService {
 
     static final String EVENT_TEMPLATE_CREATED = "TemplateUploaded";
     static final String EVENT_TEMPLATE_DELETED = "TemplateDeleted";
diff --git a/src/main/java/io/cryostat/events/TargetTemplateService.java b/src/main/java/io/cryostat/events/TargetTemplateService.java
index ba3060e08..12c4dc9c9 100644
--- a/src/main/java/io/cryostat/events/TargetTemplateService.java
+++ b/src/main/java/io/cryostat/events/TargetTemplateService.java
@@ -32,13 +32,13 @@
 import jakarta.inject.Inject;
 import org.jsoup.nodes.Document;
 
-class TargetTemplateService implements TemplateService {
+public class TargetTemplateService implements TemplateService {
 
     @ApplicationScoped
-    static class Factory {
+    public static class Factory {
         @Inject TargetConnectionManager connectionManager;
 
-        TargetTemplateService create(Target target) {
+        public TargetTemplateService create(Target target) {
             return new TargetTemplateService(connectionManager, target);
         }
     }
diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
index fc8ab8454..1a33b5476 100644
--- a/src/main/java/io/cryostat/recordings/RecordingHelper.java
+++ b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -54,8 +54,9 @@
 import io.cryostat.core.net.JFRConnection;
 import io.cryostat.core.sys.Clock;
 import io.cryostat.core.sys.FileSystem;
-import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
+import io.cryostat.events.S3TemplateService;
+import io.cryostat.events.TargetTemplateService;
 import io.cryostat.recordings.ActiveRecording.Listener.ActiveRecordingEvent;
 import io.cryostat.recordings.ActiveRecording.Listener.ArchivedRecordingEvent;
 import io.cryostat.recordings.Recordings.ArchivedRecording;
@@ -117,23 +118,24 @@ public class RecordingHelper {
             Pattern.compile("^template=([\\w]+)(?:,type=([\\w]+))?$");
     public static final String DATASOURCE_FILENAME = "cryostat-analysis.jfr";
 
-    @Inject Logger logger;
+    @Inject S3Client storage;
+
+    @Inject WebClient webClient;
+    @Inject FileSystem fs;
+    @Inject Clock clock;
     @Inject TargetConnectionManager connectionManager;
+    @Inject RemoteRecordingInputStreamFactory remoteRecordingStreamFactory;
     @Inject RecordingOptionsBuilderFactory recordingOptionsBuilderFactory;
     @Inject EventOptionsBuilder.Factory eventOptionsBuilderFactory;
-    @Inject EventBus bus;
-
-    @Inject Clock clock;
+    @Inject TargetTemplateService.Factory targetTemplateServiceFactory;
+    @Inject S3TemplateService customTemplateService;
 
     @Inject
     @Named(Producers.BASE64_URL)
     Base64 base64Url;
 
-    @Inject RemoteRecordingInputStreamFactory remoteRecordingStreamFactory;
-    @Inject S3Client storage;
-    @Inject FileSystem fs;
-
-    @Inject WebClient webClient;
+    @Inject EventBus bus;
+    @Inject Logger logger;
 
     @ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_ARCHIVES)
     String archiveBucket;
@@ -199,7 +201,7 @@ public ActiveRecording startRecording(
             throws Exception {
         String recordingName = (String) recordingOptions.get(RecordingOptionsBuilder.KEY_NAME);
         TemplateType preferredTemplateType =
-                getPreferredTemplateType(connection, templateName, templateType);
+                getPreferredTemplateType(target, templateName, templateType);
         getDescriptorByName(connection, recordingName)
                 .ifPresent(
                         previous -> {
@@ -221,7 +223,7 @@ public ActiveRecording startRecording(
                         .getService()
                         .start(
                                 recordingOptions,
-                                enableEvents(connection, templateName, preferredTemplateType));
+                                enableEvents(target, templateName, preferredTemplateType));
 
         Map<String, String> labels = metadata.labels();
         labels.put("template.name", templateName);
@@ -356,54 +358,56 @@ public Pair<String, TemplateType> parseEventSpecifierToTemplate(String eventSpec
         throw new BadRequestException(eventSpecifier);
     }
 
-    private IConstrainedMap<EventOptionID> enableAllEvents(JFRConnection connection)
-            throws Exception {
-        EventOptionsBuilder builder = eventOptionsBuilderFactory.create(connection);
+    private IConstrainedMap<EventOptionID> enableAllEvents(Target target) throws Exception {
+        return connectionManager.executeConnectedTask(
+                target,
+                connection -> {
+                    EventOptionsBuilder builder = eventOptionsBuilderFactory.create(connection);
 
-        for (IEventTypeInfo eventTypeInfo : connection.getService().getAvailableEventTypes()) {
-            builder.addEvent(eventTypeInfo.getEventTypeID().getFullKey(), "enabled", "true");
-        }
+                    for (IEventTypeInfo eventTypeInfo :
+                            connection.getService().getAvailableEventTypes()) {
+                        builder.addEvent(
+                                eventTypeInfo.getEventTypeID().getFullKey(), "enabled", "true");
+                    }
 
-        return builder.build();
+                    return builder.build();
+                });
     }
 
     public IConstrainedMap<EventOptionID> enableEvents(
-            JFRConnection connection, String templateName, TemplateType templateType)
-            throws Exception {
+            Target target, String templateName, TemplateType templateType) throws Exception {
         if (templateName.equals("ALL")) {
-            return enableAllEvents(connection);
+            return enableAllEvents(target);
+        }
+        TemplateType type = getPreferredTemplateType(target, templateName, templateType);
+        switch (type) {
+            case TARGET:
+                return targetTemplateServiceFactory
+                        .create(target)
+                        .getEvents(templateName, type)
+                        .orElseThrow();
+            case CUSTOM:
+                return customTemplateService.getEvents(templateName, templateType).orElseThrow();
+            default:
+                throw new BadRequestException(
+                        String.format("Invalid/unknown event template %s", templateName));
         }
-        // if template type not specified, try to find a Custom template by that name. If none,
-        // fall back on finding a Target built-in template by the name. If not, throw an
-        // exception and bail out.
-        TemplateType type = getPreferredTemplateType(connection, templateName, templateType);
-        return connection.getTemplateService().getEvents(templateName, type).get();
     }
 
     public TemplateType getPreferredTemplateType(
-            JFRConnection connection, String templateName, TemplateType templateType)
-            throws Exception {
+            Target target, String templateName, TemplateType templateType) throws Exception {
+        // if template type not specified, try to find a Custom template by that name. If none,
+        // fall back on finding a Target built-in template by the name. If not, throw an
+        // exception and bail out.
         if (templateType != null) {
             return templateType;
         }
-        if (templateName.equals("ALL")) {
-            // special case for the ALL meta-template
-            return TemplateType.TARGET;
-        }
-        List<Template> matchingNameTemplates =
-                connection.getTemplateService().getTemplates().stream()
-                        .filter(t -> t.getName().equals(templateName))
-                        .toList();
-        boolean custom =
-                matchingNameTemplates.stream()
-                        .anyMatch(t -> t.getType().equals(TemplateType.CUSTOM));
-        if (custom) {
+        if (customTemplateService.getTemplates().stream()
+                .anyMatch(t -> t.getName().equals(templateName))) {
             return TemplateType.CUSTOM;
         }
-        boolean target =
-                matchingNameTemplates.stream()
-                        .anyMatch(t -> t.getType().equals(TemplateType.TARGET));
-        if (target) {
+        if (targetTemplateServiceFactory.create(target).getTemplates().stream()
+                .anyMatch(t -> t.getName().equals(templateName))) {
             return TemplateType.TARGET;
         }
         throw new BadRequestException(

From f6cc721ef342281e3b771ce42bef0e61ca604485 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 16:12:46 -0500
Subject: [PATCH 33/44] update blocking annotations, make some methods private

---
 .../io/cryostat/events/S3TemplateService.java  |  3 +++
 .../cryostat/events/TargetTemplateService.java |  4 ++++
 .../cryostat/recordings/RecordingHelper.java   | 18 ++++++++++++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 7613f22b5..5ad68d95f 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -122,6 +122,7 @@ void onStart(@Observes StartupEvent evt) {
     }
 
     @Override
+    @Blocking
     public Optional<IConstrainedMap<EventOptionID>> getEvents(
             String templateName, TemplateType unused) throws FlightRecorderException {
         try (var stream = getModel(templateName)) {
@@ -137,6 +138,7 @@ public Optional<IConstrainedMap<EventOptionID>> getEvents(
     }
 
     @Override
+    @Blocking
     public List<Template> getTemplates() throws FlightRecorderException {
         return getObjects().stream()
                 .map(
@@ -153,6 +155,7 @@ public List<Template> getTemplates() throws FlightRecorderException {
     }
 
     @Override
+    @Blocking
     public Optional<Document> getXml(String templateName, TemplateType unused)
             throws FlightRecorderException {
         try (var stream = getModel(templateName)) {
diff --git a/src/main/java/io/cryostat/events/TargetTemplateService.java b/src/main/java/io/cryostat/events/TargetTemplateService.java
index 12c4dc9c9..b6323b50d 100644
--- a/src/main/java/io/cryostat/events/TargetTemplateService.java
+++ b/src/main/java/io/cryostat/events/TargetTemplateService.java
@@ -28,6 +28,7 @@
 import io.cryostat.targets.Target;
 import io.cryostat.targets.TargetConnectionManager;
 
+import io.smallrye.common.annotation.Blocking;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.jsoup.nodes.Document;
@@ -52,6 +53,7 @@ private TargetTemplateService(TargetConnectionManager connectionManager, Target
     }
 
     @Override
+    @Blocking
     public List<Template> getTemplates() throws FlightRecorderException {
         return connectionManager.executeConnectedTask(
                 target,
@@ -62,6 +64,7 @@ public List<Template> getTemplates() throws FlightRecorderException {
     }
 
     @Override
+    @Blocking
     public Optional<Document> getXml(String templateName, TemplateType unused)
             throws FlightRecorderException {
         return connectionManager.executeConnectedTask(
@@ -70,6 +73,7 @@ public Optional<Document> getXml(String templateName, TemplateType unused)
     }
 
     @Override
+    @Blocking
     public Optional<IConstrainedMap<EventOptionID>> getEvents(
             String templateName, TemplateType unused) throws FlightRecorderException {
         return connectionManager.executeConnectedTask(
diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
index 1a33b5476..e35fd9e65 100644
--- a/src/main/java/io/cryostat/recordings/RecordingHelper.java
+++ b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -189,6 +189,7 @@ void onStart(@Observes StartupEvent evt) {
         }
     }
 
+    @Blocking
     public ActiveRecording startRecording(
             Target target,
             IConstrainedMap<String> recordingOptions,
@@ -241,6 +242,7 @@ public ActiveRecording startRecording(
         return recording;
     }
 
+    @Blocking
     public ActiveRecording createSnapshot(Target target, JFRConnection connection)
             throws Exception {
         IRecordingDescriptor desc = connection.getService().getSnapshotRecording();
@@ -298,6 +300,7 @@ public ActiveRecording createSnapshot(Target target, JFRConnection connection)
         return recording;
     }
 
+    @Blocking
     private boolean snapshotIsReadable(Target target, InputStream snapshot) throws IOException {
         if (!connectionManager.markConnectionInUse(target)) {
             throw new IOException(
@@ -358,6 +361,7 @@ public Pair<String, TemplateType> parseEventSpecifierToTemplate(String eventSpec
         throw new BadRequestException(eventSpecifier);
     }
 
+    @Blocking
     private IConstrainedMap<EventOptionID> enableAllEvents(Target target) throws Exception {
         return connectionManager.executeConnectedTask(
                 target,
@@ -374,7 +378,8 @@ private IConstrainedMap<EventOptionID> enableAllEvents(Target target) throws Exc
                 });
     }
 
-    public IConstrainedMap<EventOptionID> enableEvents(
+    @Blocking
+    private IConstrainedMap<EventOptionID> enableEvents(
             Target target, String templateName, TemplateType templateType) throws Exception {
         if (templateName.equals("ALL")) {
             return enableAllEvents(target);
@@ -394,7 +399,8 @@ public IConstrainedMap<EventOptionID> enableEvents(
         }
     }
 
-    public TemplateType getPreferredTemplateType(
+    @Blocking
+    private TemplateType getPreferredTemplateType(
             Target target, String templateName, TemplateType templateType) throws Exception {
         // if template type not specified, try to find a Custom template by that name. If none,
         // fall back on finding a Target built-in template by the name. If not, throw an
@@ -457,10 +463,12 @@ private RecordingState mapState(IRecordingDescriptor desc) {
         }
     }
 
+    @Blocking
     public List<S3Object> listArchivedRecordingObjects() {
         return listArchivedRecordingObjects(null);
     }
 
+    @Blocking
     public List<S3Object> listArchivedRecordingObjects(String jvmId) {
         var builder = ListObjectsV2Request.builder().bucket(archiveBucket);
         if (StringUtils.isNotBlank(jvmId)) {
@@ -484,6 +492,7 @@ public String saveRecording(ActiveRecording recording, Instant expiry) throws Ex
         return saveRecording(recording, null, expiry);
     }
 
+    @Blocking
     public String saveRecording(ActiveRecording recording, String savename, Instant expiry)
             throws Exception {
         // AWS object key name guidelines advise characters to avoid (% so we should not pass url
@@ -613,6 +622,7 @@ public Optional<Metadata> getArchivedRecordingMetadata(String jvmId, String file
         return getArchivedRecordingMetadata(archivedRecordingKey(jvmId, filename));
     }
 
+    @Blocking
     public Optional<Metadata> getArchivedRecordingMetadata(String storageKey) {
         try {
             return Optional.of(
@@ -670,6 +680,7 @@ public InputStream getArchivedRecordingStream(String jvmId, String recordingName
         return getArchivedRecordingStream(encodedKey(jvmId, recordingName));
     }
 
+    @Blocking
     public InputStream getArchivedRecordingStream(String encodedKey) {
         String key = new String(base64Url.decode(encodedKey), StandardCharsets.UTF_8);
 
@@ -696,6 +707,7 @@ public String reportUrl(String jvmId, String filename) {
         return String.format("/api/v3/reports/%s", encodedKey(jvmId, filename));
     }
 
+    @Blocking
     private int retryRead(ReadableByteChannel channel, ByteBuffer buffer) throws IOException {
         int attempts = 30;
         int read = 0;
@@ -718,6 +730,7 @@ private int retryRead(ReadableByteChannel channel, ByteBuffer buffer) throws IOE
     }
 
     /* Archived Recording Helpers */
+    @Blocking
     public void deleteArchivedRecording(String jvmId, String filename) {
         storage.deleteObject(
                 DeleteObjectRequest.builder()
@@ -882,6 +895,7 @@ private Uni<String> uploadToJFRDatasource(Path recordingPath)
                         });
     }
 
+    @Blocking
     Optional<Path> getRecordingCopyPath(
             JFRConnection connection, Target target, String recordingName) throws Exception {
         return connection.getService().getAvailableRecordings().stream()

From bfed0bc0b09546d8228be0090eb0cc57245f8dc6 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 16:13:04 -0500
Subject: [PATCH 34/44] trim strings

---
 src/main/java/io/cryostat/events/S3TemplateService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 5ad68d95f..a237bea20 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -191,10 +191,11 @@ private Template convertObject(S3Object object) throws InvalidEventTemplateExcep
                 t -> {
                     var encodedKey = t.key();
                     var decodedKey =
-                            new String(base64Url.decode(encodedKey), StandardCharsets.UTF_8);
+                            new String(base64Url.decode(encodedKey), StandardCharsets.UTF_8).trim();
                     var encodedValue = t.value();
                     var decodedValue =
-                            new String(base64Url.decode(encodedValue), StandardCharsets.UTF_8);
+                            new String(base64Url.decode(encodedValue), StandardCharsets.UTF_8)
+                                    .trim();
                     decodedList.add(Pair.of(decodedKey, decodedValue));
                 });
         var label =

From 6cfa947f12aaaa76c942570d315993a1bc782d7f Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 16:13:33 -0500
Subject: [PATCH 35/44] remove redundant/bugged template preferred type
 selection

---
 src/main/java/io/cryostat/recordings/RecordingHelper.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
index e35fd9e65..646800369 100644
--- a/src/main/java/io/cryostat/recordings/RecordingHelper.java
+++ b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -384,12 +384,11 @@ private IConstrainedMap<EventOptionID> enableEvents(
         if (templateName.equals("ALL")) {
             return enableAllEvents(target);
         }
-        TemplateType type = getPreferredTemplateType(target, templateName, templateType);
-        switch (type) {
+        switch (templateType) {
             case TARGET:
                 return targetTemplateServiceFactory
                         .create(target)
-                        .getEvents(templateName, type)
+                        .getEvents(templateName, templateType)
                         .orElseThrow();
             case CUSTOM:
                 return customTemplateService.getEvents(templateName, templateType).orElseThrow();

From c83907104e378abc8f303b7b5a0ad169e66055d2 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 22:17:38 -0500
Subject: [PATCH 36/44] refactor, fix bug where templateType in event specifier
 string became required

---
 .../cryostat/recordings/RecordingHelper.java  | 93 ++++++++++++-------
 .../io/cryostat/recordings/Recordings.java    |  8 +-
 .../java/io/cryostat/rules/RuleService.java   | 12 ++-
 3 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
index 646800369..07f219cce 100644
--- a/src/main/java/io/cryostat/recordings/RecordingHelper.java
+++ b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -39,6 +39,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -51,10 +52,13 @@
 import io.cryostat.ConfigProperties;
 import io.cryostat.Producers;
 import io.cryostat.core.EventOptionsBuilder;
+import io.cryostat.core.FlightRecorderException;
 import io.cryostat.core.net.JFRConnection;
 import io.cryostat.core.sys.Clock;
 import io.cryostat.core.sys.FileSystem;
+import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
+import io.cryostat.events.EventTemplates;
 import io.cryostat.events.S3TemplateService;
 import io.cryostat.events.TargetTemplateService;
 import io.cryostat.recordings.ActiveRecording.Listener.ActiveRecordingEvent;
@@ -193,16 +197,13 @@ void onStart(@Observes StartupEvent evt) {
     public ActiveRecording startRecording(
             Target target,
             IConstrainedMap<String> recordingOptions,
-            String templateName,
-            TemplateType templateType,
+            Template eventTemplate,
             Metadata metadata,
             boolean archiveOnStop,
             RecordingReplace replace,
             JFRConnection connection)
             throws Exception {
         String recordingName = (String) recordingOptions.get(RecordingOptionsBuilder.KEY_NAME);
-        TemplateType preferredTemplateType =
-                getPreferredTemplateType(target, templateName, templateType);
         getDescriptorByName(connection, recordingName)
                 .ifPresent(
                         previous -> {
@@ -222,13 +223,11 @@ public ActiveRecording startRecording(
         IRecordingDescriptor desc =
                 connection
                         .getService()
-                        .start(
-                                recordingOptions,
-                                enableEvents(target, templateName, preferredTemplateType));
+                        .start(recordingOptions, enableEvents(target, eventTemplate));
 
         Map<String, String> labels = metadata.labels();
-        labels.put("template.name", templateName);
-        labels.put("template.type", preferredTemplateType.name());
+        labels.put("template.name", eventTemplate.getName());
+        labels.put("template.type", eventTemplate.getType().toString());
         Metadata meta = new Metadata(labels);
 
         ActiveRecording recording = ActiveRecording.from(target, desc, meta);
@@ -346,7 +345,7 @@ public LinkedRecordingDescriptor toExternalForm(ActiveRecording recording) {
                 recording.metadata);
     }
 
-    public Pair<String, TemplateType> parseEventSpecifierToTemplate(String eventSpecifier) {
+    public Pair<String, TemplateType> parseEventSpecifier(String eventSpecifier) {
         if (TEMPLATE_PATTERN.matcher(eventSpecifier).matches()) {
             Matcher m = TEMPLATE_PATTERN.matcher(eventSpecifier);
             m.find();
@@ -379,44 +378,74 @@ private IConstrainedMap<EventOptionID> enableAllEvents(Target target) throws Exc
     }
 
     @Blocking
-    private IConstrainedMap<EventOptionID> enableEvents(
-            Target target, String templateName, TemplateType templateType) throws Exception {
-        if (templateName.equals("ALL")) {
+    private IConstrainedMap<EventOptionID> enableEvents(Target target, Template eventTemplate)
+            throws Exception {
+        if (EventTemplates.ALL_EVENTS_TEMPLATE.equals(eventTemplate)) {
             return enableAllEvents(target);
         }
-        switch (templateType) {
+        switch (eventTemplate.getType()) {
             case TARGET:
                 return targetTemplateServiceFactory
                         .create(target)
-                        .getEvents(templateName, templateType)
+                        .getEvents(eventTemplate.getName(), eventTemplate.getType())
                         .orElseThrow();
             case CUSTOM:
-                return customTemplateService.getEvents(templateName, templateType).orElseThrow();
+                return customTemplateService
+                        .getEvents(eventTemplate.getName(), eventTemplate.getType())
+                        .orElseThrow();
             default:
                 throw new BadRequestException(
-                        String.format("Invalid/unknown event template %s", templateName));
+                        String.format(
+                                "Invalid/unknown event template %s", eventTemplate.getName()));
         }
     }
 
     @Blocking
-    private TemplateType getPreferredTemplateType(
+    public Template getPreferredTemplate(
             Target target, String templateName, TemplateType templateType) throws Exception {
-        // if template type not specified, try to find a Custom template by that name. If none,
-        // fall back on finding a Target built-in template by the name. If not, throw an
-        // exception and bail out.
-        if (templateType != null) {
-            return templateType;
-        }
-        if (customTemplateService.getTemplates().stream()
-                .anyMatch(t -> t.getName().equals(templateName))) {
-            return TemplateType.CUSTOM;
+        Objects.requireNonNull(target);
+        Objects.requireNonNull(templateName);
+        if (templateName.equals(EventTemplates.ALL_EVENTS_TEMPLATE.getName())) {
+            return EventTemplates.ALL_EVENTS_TEMPLATE;
         }
-        if (targetTemplateServiceFactory.create(target).getTemplates().stream()
-                .anyMatch(t -> t.getName().equals(templateName))) {
-            return TemplateType.TARGET;
+        Supplier<Optional<Template>> custom =
+                () -> {
+                    try {
+                        return customTemplateService.getTemplates().stream()
+                                .filter(t -> t.getName().equals(templateName))
+                                .findFirst();
+                    } catch (FlightRecorderException e) {
+                        logger.error(e);
+                        return Optional.empty();
+                    }
+                };
+
+        Supplier<Optional<Template>> remote =
+                () -> {
+                    try {
+                        return targetTemplateServiceFactory.create(target).getTemplates().stream()
+                                .filter(t -> t.getName().equals(templateName))
+                                .findFirst();
+                    } catch (FlightRecorderException e) {
+                        logger.error(e);
+                        return Optional.empty();
+                    }
+                };
+        switch (templateType) {
+            case TARGET:
+                return remote.get().orElseThrow();
+            case CUSTOM:
+                return custom.get().orElseThrow();
+            default:
+                return custom.get()
+                        .or(() -> remote.get())
+                        .orElseThrow(
+                                () ->
+                                        new BadRequestException(
+                                                String.format(
+                                                        "Invalid/unknown event template %s",
+                                                        templateName)));
         }
-        throw new BadRequestException(
-                String.format("Invalid/unknown event template %s", templateName));
     }
 
     static Optional<IRecordingDescriptor> getDescriptorById(
diff --git a/src/main/java/io/cryostat/recordings/Recordings.java b/src/main/java/io/cryostat/recordings/Recordings.java
index 0760ffe7f..6db402649 100644
--- a/src/main/java/io/cryostat/recordings/Recordings.java
+++ b/src/main/java/io/cryostat/recordings/Recordings.java
@@ -48,6 +48,7 @@
 import io.cryostat.core.RecordingOptionsCustomizer;
 import io.cryostat.core.net.JFRConnection;
 import io.cryostat.core.sys.Clock;
+import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.recordings.ActiveRecording.Listener.ArchivedRecordingEvent;
 import io.cryostat.recordings.RecordingHelper.RecordingReplace;
@@ -608,7 +609,9 @@ public Response createRecording(
 
         Target target = Target.find("id", id).singleResult();
 
-        Pair<String, TemplateType> template = recordingHelper.parseEventSpecifierToTemplate(events);
+        Pair<String, TemplateType> pair = recordingHelper.parseEventSpecifier(events);
+        Template template =
+                recordingHelper.getPreferredTemplate(target, pair.getKey(), pair.getValue());
 
         ActiveRecording recording =
                 connectionManager.executeConnectedTask(
@@ -648,8 +651,7 @@ public Response createRecording(
                             return recordingHelper.startRecording(
                                     target,
                                     recordingOptions,
-                                    template.getLeft(),
-                                    template.getRight(),
+                                    template,
                                     new Metadata(labels),
                                     archiveOnStop.orElse(false),
                                     replacement,
diff --git a/src/main/java/io/cryostat/rules/RuleService.java b/src/main/java/io/cryostat/rules/RuleService.java
index 6e3d67748..bf726e608 100644
--- a/src/main/java/io/cryostat/rules/RuleService.java
+++ b/src/main/java/io/cryostat/rules/RuleService.java
@@ -33,6 +33,7 @@
 import org.openjdk.jmc.rjmx.ServiceNotAvailableException;
 
 import io.cryostat.core.net.JFRConnection;
+import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.expressions.MatchExpressionEvaluator;
 import io.cryostat.recordings.ActiveRecording;
@@ -144,9 +145,11 @@ public void activate(Rule rule, Target target) throws Exception {
                         connection -> {
                             var recordingOptions = createRecordingOptions(rule, connection);
 
-                            Pair<String, TemplateType> template =
-                                    recordingHelper.parseEventSpecifierToTemplate(
-                                            rule.eventSpecifier);
+                            Pair<String, TemplateType> pair =
+                                    recordingHelper.parseEventSpecifier(rule.eventSpecifier);
+                            Template template =
+                                    recordingHelper.getPreferredTemplate(
+                                            target, pair.getKey(), pair.getValue());
 
                             Map<String, String> labels = new HashMap<>();
                             labels.put("rule", rule.name);
@@ -154,8 +157,7 @@ public void activate(Rule rule, Target target) throws Exception {
                             return recordingHelper.startRecording(
                                     target,
                                     recordingOptions,
-                                    template.getLeft(),
-                                    template.getRight(),
+                                    template,
                                     meta,
                                     false,
                                     RecordingReplace.ALWAYS,

From e3e9517eb4bc9e7be208bea1c6b06e15993260fb Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 22:38:41 -0500
Subject: [PATCH 37/44] fix bug where downloaded templates are Optionals, not
 direct XML

---
 src/main/java/io/cryostat/events/EventTemplates.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 98639da30..1ab185cb7 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -197,9 +197,10 @@ public String getTargetTemplate(
                 return targetTemplateServiceFactory
                         .create(target)
                         .getXml(templateName, templateType)
+                        .get()
                         .toString();
             case CUSTOM:
-                return customTemplateService.getXml(templateName, templateType).toString();
+                return customTemplateService.getXml(templateName, templateType).get().toString();
             default:
                 throw new BadRequestException();
         }

From afcdc93cb31f1e9dd05aac5c00eac05bb011f6c0 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 22:42:53 -0500
Subject: [PATCH 38/44] include content type on template download response

---
 .../io/cryostat/events/EventTemplates.java    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 1ab185cb7..1aa69f99e 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -25,6 +25,7 @@
 import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
+import io.cryostat.util.HttpMimeType;
 
 import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
@@ -36,12 +37,14 @@
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.Response;
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.RestForm;
 import org.jboss.resteasy.reactive.RestPath;
 import org.jboss.resteasy.reactive.RestResponse;
 import org.jboss.resteasy.reactive.multipart.FileUpload;
+import org.jsoup.nodes.Document;
 
 @Path("")
 public class EventTemplates {
@@ -188,21 +191,28 @@ public List<Template> listTargetTemplates(@RestPath long id) throws Exception {
     @Blocking
     @Path("/api/v3/targets/{id}/event_templates/{templateType}/{templateName}")
     @RolesAllowed("read")
-    public String getTargetTemplate(
+    public Response getTargetTemplate(
             @RestPath long id, @RestPath TemplateType templateType, @RestPath String templateName)
             throws Exception {
         Target target = Target.find("id", id).singleResult();
+        Document doc;
         switch (templateType) {
             case TARGET:
-                return targetTemplateServiceFactory
-                        .create(target)
-                        .getXml(templateName, templateType)
-                        .get()
-                        .toString();
+                doc =
+                        targetTemplateServiceFactory
+                                .create(target)
+                                .getXml(templateName, templateType)
+                                .get();
+                break;
             case CUSTOM:
-                return customTemplateService.getXml(templateName, templateType).get().toString();
+                doc = customTemplateService.getXml(templateName, templateType).get();
+                break;
             default:
                 throw new BadRequestException();
         }
+        return Response.status(RestResponse.Status.OK)
+                .header(HttpHeaders.CONTENT_TYPE, HttpMimeType.JFC.mime())
+                .entity(doc.toString())
+                .build();
     }
 }

From cfa46db4bea8f21cd55cd7a5405db8a5e1afaa6b Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 15 Feb 2024 22:49:33 -0500
Subject: [PATCH 39/44] use orElseThrow instead of get

---
 src/main/java/io/cryostat/events/EventTemplates.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 1aa69f99e..4f1c0b159 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -202,10 +202,10 @@ public Response getTargetTemplate(
                         targetTemplateServiceFactory
                                 .create(target)
                                 .getXml(templateName, templateType)
-                                .get();
+                                .orElseThrow();
                 break;
             case CUSTOM:
-                doc = customTemplateService.getXml(templateName, templateType).get();
+                doc = customTemplateService.getXml(templateName, templateType).orElseThrow();
                 break;
             default:
                 throw new BadRequestException();

From bca3ec904811e897558044c265d23df843811974 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Fri, 16 Feb 2024 00:06:55 -0500
Subject: [PATCH 40/44] working on test

---
 .../java/itest/CustomEventTemplateTest.java   | 127 ++++++++++++
 src/test/java/itest/TemplatePostDeleteIT.java | 181 ------------------
 src/test/java/itest/util/Utils.java           |  35 ++++
 3 files changed, 162 insertions(+), 181 deletions(-)
 create mode 100644 src/test/java/itest/CustomEventTemplateTest.java
 delete mode 100644 src/test/java/itest/TemplatePostDeleteIT.java

diff --git a/src/test/java/itest/CustomEventTemplateTest.java b/src/test/java/itest/CustomEventTemplateTest.java
new file mode 100644
index 000000000..2b439146b
--- /dev/null
+++ b/src/test/java/itest/CustomEventTemplateTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright The Cryostat Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package itest;
+
+import java.io.File;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.client.HttpResponse;
+import io.vertx.ext.web.multipart.MultipartForm;
+import itest.bases.StandardSelfTest;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+@Disabled("TODO")
+public class CustomEventTemplateTest extends StandardSelfTest {
+
+    static final String INVALID_TEMPLATE_FILE_NAME = "invalidTemplate.xml";
+    static final String SANITIZE_TEMPLATE_FILE_NAME = "TemplateToSanitize.jfc";
+    static final String TEMPLATE_NAME = "invalidTemplate";
+    static final String MEDIA_TYPE = "application/xml";
+    static final String REQ_URL = "/api/v1/templates";
+
+    @Test
+    public void shouldThrowIfTemplateUploadNameInvalid() throws Exception {
+        ClassLoader classLoader = getClass().getClassLoader();
+        File invalidTemplate =
+                new File(classLoader.getResource(INVALID_TEMPLATE_FILE_NAME).getFile());
+        String path = invalidTemplate.getAbsolutePath();
+
+        MultipartForm form =
+                MultipartForm.create()
+                        .attribute("invalidTemplateAttribute", INVALID_TEMPLATE_FILE_NAME)
+                        .binaryFileUpload(
+                                TEMPLATE_NAME, INVALID_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
+
+        HttpResponse<Buffer> resp =
+                webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
+        MatcherAssert.assertThat(resp.statusCode(), Matchers.equalTo(400));
+    }
+
+    @Test
+    public void shouldThrowWhenPostingInvalidTemplate() throws Exception {
+        ClassLoader classLoader = getClass().getClassLoader();
+        File invalidTemplate =
+                new File(classLoader.getResource(INVALID_TEMPLATE_FILE_NAME).getFile());
+        String path = invalidTemplate.getAbsolutePath();
+
+        MultipartForm form =
+                MultipartForm.create()
+                        .attribute("template", INVALID_TEMPLATE_FILE_NAME)
+                        .binaryFileUpload(
+                                TEMPLATE_NAME, INVALID_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
+
+        HttpResponse<Buffer> resp =
+                webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
+        MatcherAssert.assertThat(resp.statusCode(), Matchers.equalTo(400));
+    }
+
+    @Test
+    public void testDeleteRecordingThrowsOnNonExistentTemplate() throws Exception {
+        HttpResponse<Buffer> resp =
+                webClient
+                        .extensions()
+                        .delete(
+                                String.format("%s/%s", REQ_URL, INVALID_TEMPLATE_FILE_NAME),
+                                REQUEST_TIMEOUT_SECONDS);
+        MatcherAssert.assertThat(resp.statusCode(), Matchers.equalTo(404));
+    }
+
+    @Test
+    public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
+        try {
+            ClassLoader classLoader = getClass().getClassLoader();
+            File templateToSanitize =
+                    new File(classLoader.getResource(SANITIZE_TEMPLATE_FILE_NAME).getFile());
+            String path = templateToSanitize.getAbsolutePath();
+            MultipartForm form =
+                    MultipartForm.create()
+                            .attribute("template", SANITIZE_TEMPLATE_FILE_NAME)
+                            .binaryFileUpload(
+                                    "template", SANITIZE_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
+            HttpResponse<Buffer> postResp =
+                    webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
+            MatcherAssert.assertThat(postResp.statusCode(), Matchers.equalTo(200));
+
+            HttpResponse<Buffer> getResp =
+                    webClient
+                            .extensions()
+                            .get(
+                                    String.format(
+                                            "/api/v1/targets/%s/templates",
+                                            getSelfReferenceConnectUrlEncoded()),
+                                    REQUEST_TIMEOUT_SECONDS);
+            boolean foundSanitizedTemplate = false;
+            for (Object o : getResp.bodyAsJsonArray()) {
+                JsonObject json = (JsonObject) o;
+                foundSanitizedTemplate =
+                        foundSanitizedTemplate
+                                || json.getString("name").equals("Template_To_Sanitize");
+            }
+            Assertions.assertTrue(foundSanitizedTemplate);
+        } finally {
+            webClient
+                    .extensions()
+                    .delete(REQ_URL + "/Template_To_Sanitize", REQUEST_TIMEOUT_SECONDS);
+        }
+    }
+}
diff --git a/src/test/java/itest/TemplatePostDeleteIT.java b/src/test/java/itest/TemplatePostDeleteIT.java
deleted file mode 100644
index bc17e83e7..000000000
--- a/src/test/java/itest/TemplatePostDeleteIT.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright The Cryostat Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package itest;
-
-import java.io.File;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.web.handler.HttpException;
-import io.vertx.ext.web.multipart.MultipartForm;
-import itest.bases.StandardSelfTest;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-@Disabled("TODO")
-public class TemplatePostDeleteIT extends StandardSelfTest {
-
-    static final String INVALID_TEMPLATE_FILE_NAME = "invalidTemplate.xml";
-    static final String SANITIZE_TEMPLATE_FILE_NAME = "TemplateToSanitize.jfc";
-    static final String TEMPLATE_NAME = "invalidTemplate";
-    static final String MEDIA_TYPE = "application/xml";
-    static final String REQ_URL = "/api/v1/templates";
-
-    @Test
-    public void shouldThrowIfTemplateUploadNameInvalid() throws Exception {
-
-        CompletableFuture<Integer> response = new CompletableFuture<>();
-        ClassLoader classLoader = getClass().getClassLoader();
-        File invalidTemplate =
-                new File(classLoader.getResource(INVALID_TEMPLATE_FILE_NAME).getFile());
-        String path = invalidTemplate.getAbsolutePath();
-
-        MultipartForm form =
-                MultipartForm.create()
-                        .attribute("invalidTemplateAttribute", INVALID_TEMPLATE_FILE_NAME)
-                        .binaryFileUpload(
-                                TEMPLATE_NAME, INVALID_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
-
-        webClient
-                .post(REQ_URL)
-                .followRedirects(true)
-                .sendMultipartForm(
-                        form,
-                        ar -> {
-                            assertRequestStatus(ar, response);
-                        });
-        ExecutionException ex =
-                Assertions.assertThrows(ExecutionException.class, () -> response.get());
-        MatcherAssert.assertThat(
-                ((HttpException) ex.getCause()).getStatusCode(), Matchers.equalTo(400));
-        MatcherAssert.assertThat(ex.getCause().getMessage(), Matchers.equalTo("Bad Request"));
-    }
-
-    @Test
-    public void shouldThrowWhenPostingInvalidTemplate() throws Exception {
-
-        CompletableFuture<Integer> response = new CompletableFuture<>();
-        ClassLoader classLoader = getClass().getClassLoader();
-        File invalidTemplate =
-                new File(classLoader.getResource(INVALID_TEMPLATE_FILE_NAME).getFile());
-        String path = invalidTemplate.getAbsolutePath();
-
-        MultipartForm form =
-                MultipartForm.create()
-                        .attribute("template", INVALID_TEMPLATE_FILE_NAME)
-                        .binaryFileUpload(
-                                TEMPLATE_NAME, INVALID_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
-
-        webClient
-                .post(REQ_URL)
-                .followRedirects(true)
-                .sendMultipartForm(
-                        form,
-                        ar -> {
-                            assertRequestStatus(ar, response);
-                        });
-        ExecutionException ex =
-                Assertions.assertThrows(ExecutionException.class, () -> response.get());
-        MatcherAssert.assertThat(
-                ((HttpException) ex.getCause()).getStatusCode(), Matchers.equalTo(400));
-        MatcherAssert.assertThat(ex.getCause().getMessage(), Matchers.equalTo("Bad Request"));
-    }
-
-    @Test
-    public void testDeleteRecordingThrowsOnNonExistentTemplate() throws Exception {
-
-        CompletableFuture<Void> response = new CompletableFuture<>();
-
-        webClient
-                .delete(String.format("%s/%s", REQ_URL, INVALID_TEMPLATE_FILE_NAME))
-                .followRedirects(true)
-                .send(
-                        ar -> {
-                            assertRequestStatus(ar, response);
-                        });
-        ExecutionException ex =
-                Assertions.assertThrows(ExecutionException.class, () -> response.get());
-        MatcherAssert.assertThat(
-                ((HttpException) ex.getCause()).getStatusCode(), Matchers.equalTo(404));
-        MatcherAssert.assertThat(ex.getCause().getMessage(), Matchers.equalTo("Not Found"));
-    }
-
-    @Test
-    public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
-        try {
-            CompletableFuture<Integer> postResponse = new CompletableFuture<>();
-            ClassLoader classLoader = getClass().getClassLoader();
-            File templateToSanitize =
-                    new File(classLoader.getResource(SANITIZE_TEMPLATE_FILE_NAME).getFile());
-            String path = templateToSanitize.getAbsolutePath();
-            MultipartForm form =
-                    MultipartForm.create()
-                            .attribute("template", SANITIZE_TEMPLATE_FILE_NAME)
-                            .binaryFileUpload(
-                                    "template", SANITIZE_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
-            webClient
-                    .post(REQ_URL)
-                    .followRedirects(true)
-                    .sendMultipartForm(
-                            form,
-                            ar -> {
-                                assertRequestStatus(ar, postResponse);
-                                postResponse.complete(ar.result().statusCode());
-                            });
-            MatcherAssert.assertThat(postResponse.get(), Matchers.equalTo(200));
-
-            CompletableFuture<JsonArray> getResponse = new CompletableFuture<>();
-            webClient
-                    .get(
-                            String.format(
-                                    "/api/v1/targets/%s/templates",
-                                    getSelfReferenceConnectUrlEncoded()))
-                    .followRedirects(true)
-                    .send(
-                            ar -> {
-                                assertRequestStatus(ar, getResponse);
-                                JsonArray response = ar.result().bodyAsJsonArray();
-                                getResponse.complete(response);
-                            });
-            boolean foundSanitizedTemplate = false;
-            for (Object o : getResponse.get()) {
-                JsonObject json = (JsonObject) o;
-                foundSanitizedTemplate =
-                        foundSanitizedTemplate
-                                || json.getString("name").equals("Template_To_Sanitize");
-            }
-            Assertions.assertTrue(foundSanitizedTemplate);
-        } finally {
-            CompletableFuture<Integer> deleteResponse = new CompletableFuture<>();
-            webClient
-                    .delete(REQ_URL + "/Template_To_Sanitize")
-                    .followRedirects(true)
-                    .send(
-                            ar -> {
-                                assertRequestStatus(ar, deleteResponse);
-                                deleteResponse.complete(ar.result().statusCode());
-                            });
-            MatcherAssert.assertThat(deleteResponse.get(), Matchers.equalTo(200));
-        }
-    }
-}
diff --git a/src/test/java/itest/util/Utils.java b/src/test/java/itest/util/Utils.java
index d8172de2a..3bfcb6dcf 100644
--- a/src/test/java/itest/util/Utils.java
+++ b/src/test/java/itest/util/Utils.java
@@ -35,6 +35,7 @@
 import io.vertx.ext.web.client.HttpResponse;
 import io.vertx.ext.web.client.WebClientOptions;
 import io.vertx.ext.web.client.impl.WebClientBase;
+import io.vertx.ext.web.multipart.MultipartForm;
 
 public class Utils {
 
@@ -92,6 +93,9 @@ HttpResponse<Buffer> post(String url, Buffer payload, int timeout)
         HttpResponse<Buffer> post(String url, MultiMap payload, int timeout)
                 throws InterruptedException, ExecutionException, TimeoutException;
 
+        HttpResponse<Buffer> post(String url, MultipartForm payload, int timeout)
+                throws InterruptedException, ExecutionException, TimeoutException;
+
         HttpResponse<Buffer> delete(String url, int timeout)
                 throws InterruptedException, ExecutionException, TimeoutException;
 
@@ -197,6 +201,37 @@ public HttpResponse<Buffer> post(String url, MultiMap payload, int timeout)
                 return future.get(timeout, TimeUnit.SECONDS);
             }
 
+            public HttpResponse<Buffer> post(String url, MultipartForm payload, int timeout)
+                    throws InterruptedException, ExecutionException, TimeoutException {
+                CompletableFuture<HttpResponse<Buffer>> future = new CompletableFuture<>();
+                RequestOptions options = new RequestOptions().setURI(url);
+                HttpRequest<Buffer> req = TestWebClient.this.request(HttpMethod.POST, options);
+                if (payload != null) {
+                    req.sendMultipartForm(
+                            payload,
+                            ar -> {
+                                if (ar.succeeded()) {
+                                    future.complete(ar.result());
+                                } else {
+                                    future.completeExceptionally(ar.cause());
+                                }
+                            });
+                } else {
+                    req.send(
+                            ar -> {
+                                if (ar.succeeded()) {
+                                    future.complete(ar.result());
+                                } else {
+                                    future.completeExceptionally(ar.cause());
+                                }
+                            });
+                }
+                if (future.get().statusCode() == 308) {
+                    return post(future.get().getHeader("Location"), payload, timeout);
+                }
+                return future.get(timeout, TimeUnit.SECONDS);
+            }
+
             public HttpResponse<Buffer> delete(String url, int timeout)
                     throws InterruptedException, ExecutionException, TimeoutException {
                 CompletableFuture<HttpResponse<Buffer>> future = new CompletableFuture<>();

From 74eebe3e020923e8f87e996966e46c3f71bbcdab Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Fri, 16 Feb 2024 09:13:49 -0500
Subject: [PATCH 41/44] better pre-delete checks, emit full template
 description on notification

---
 .../io/cryostat/events/S3TemplateService.java | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index a237bea20..bc26d5429 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -298,16 +298,25 @@ public Template addTemplate(InputStream stream)
     @Blocking
     @Override
     public void deleteTemplate(String templateName) {
-        var req =
-                DeleteObjectRequest.builder()
-                        .bucket(eventTemplatesBucket)
-                        .key(templateName)
-                        .build();
-        storage.deleteObject(req);
-        bus.publish(
-                MessagingServer.class.getName(),
-                new Notification(
-                        EVENT_TEMPLATE_DELETED, Map.of("template", Map.of("name", templateName))));
+        try {
+            var template =
+                    getTemplates().stream()
+                            .filter(t -> t.getName().equals(templateName))
+                            .findFirst()
+                            .orElseThrow();
+            var req =
+                    DeleteObjectRequest.builder()
+                            .bucket(eventTemplatesBucket)
+                            .key(templateName)
+                            .build();
+            if (storage.deleteObject(req).sdkHttpResponse().isSuccessful()) {
+                bus.publish(
+                        MessagingServer.class.getName(),
+                        new Notification(EVENT_TEMPLATE_DELETED, Map.of("template", template)));
+            }
+        } catch (FlightRecorderException e) {
+            logger.error(e);
+        }
     }
 
     private Tagging createTemplateTagging(

From dea97bddca0eaa59757232e36ff60f3636481a46 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Fri, 16 Feb 2024 09:33:57 -0500
Subject: [PATCH 42/44] handle NoSuchElementException as 404

---
 src/main/java/io/cryostat/ExceptionMappers.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/io/cryostat/ExceptionMappers.java b/src/main/java/io/cryostat/ExceptionMappers.java
index 3c166ef92..cb3bb2cae 100644
--- a/src/main/java/io/cryostat/ExceptionMappers.java
+++ b/src/main/java/io/cryostat/ExceptionMappers.java
@@ -15,6 +15,7 @@
  */
 package io.cryostat;
 
+import java.util.NoSuchElementException;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 
@@ -45,6 +46,11 @@ public RestResponse<Void> mapNoResultException(NoResultException ex) {
         return RestResponse.notFound();
     }
 
+    @ServerExceptionMapper
+    public RestResponse<Void> mapNoSuchElementException(NoSuchElementException ex) {
+        return RestResponse.notFound();
+    }
+
     @ServerExceptionMapper
     public RestResponse<Void> mapConstraintViolationException(ConstraintViolationException ex) {
         logger.warn(ex);

From 036b0390b05bfffa9782e8927da2a2ba0371c661 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Fri, 16 Feb 2024 09:48:59 -0500
Subject: [PATCH 43/44] more work on test - loading resource not working

---
 .../io/cryostat/events/S3TemplateService.java |  1 -
 .../java/itest/CustomEventTemplateTest.java   | 25 +++++++++++--------
 ...ToSanitize.jfc => CustomEventTemplate.jfc} |  2 +-
 src/test/resources/invalidTemplate.xml        |  1 +
 4 files changed, 17 insertions(+), 12 deletions(-)
 rename src/test/resources/{TemplateToSanitize.jfc => CustomEventTemplate.jfc} (99%)
 create mode 100644 src/test/resources/invalidTemplate.xml

diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index bc26d5429..6abf8dbc2 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -265,7 +265,6 @@ public Template addTemplate(InputStream stream)
             }
 
             String templateName = labelAttr.getExplicitValue();
-            templateName = templateName.replaceAll("[\\W]+", "_");
 
             XMLTagInstance root = model.getRoot();
             root.setValue(JFCGrammar.ATTRIBUTE_LABEL_MANDATORY, templateName);
diff --git a/src/test/java/itest/CustomEventTemplateTest.java b/src/test/java/itest/CustomEventTemplateTest.java
index 2b439146b..557a94340 100644
--- a/src/test/java/itest/CustomEventTemplateTest.java
+++ b/src/test/java/itest/CustomEventTemplateTest.java
@@ -23,6 +23,7 @@
 import io.vertx.ext.web.client.HttpResponse;
 import io.vertx.ext.web.multipart.MultipartForm;
 import itest.bases.StandardSelfTest;
+import org.apache.http.client.utils.URLEncodedUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
@@ -34,7 +35,7 @@
 public class CustomEventTemplateTest extends StandardSelfTest {
 
     static final String INVALID_TEMPLATE_FILE_NAME = "invalidTemplate.xml";
-    static final String SANITIZE_TEMPLATE_FILE_NAME = "TemplateToSanitize.jfc";
+    static final String TEMPLATE_FILE_NAME = "CustomEventTemplate.jfc";
     static final String TEMPLATE_NAME = "invalidTemplate";
     static final String MEDIA_TYPE = "application/xml";
     static final String REQ_URL = "/api/v1/templates";
@@ -87,17 +88,16 @@ public void testDeleteRecordingThrowsOnNonExistentTemplate() throws Exception {
     }
 
     @Test
-    public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
+    public void testPostedTemplateCanBeDeleted() throws Exception {
         try {
             ClassLoader classLoader = getClass().getClassLoader();
-            File templateToSanitize =
-                    new File(classLoader.getResource(SANITIZE_TEMPLATE_FILE_NAME).getFile());
-            String path = templateToSanitize.getAbsolutePath();
+            File customEventTemplate =
+                    new File(classLoader.getResource(TEMPLATE_FILE_NAME).getFile());
+            String path = customEventTemplate.getAbsolutePath();
             MultipartForm form =
                     MultipartForm.create()
-                            .attribute("template", SANITIZE_TEMPLATE_FILE_NAME)
-                            .binaryFileUpload(
-                                    "template", SANITIZE_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
+                            .attribute("template", TEMPLATE_FILE_NAME)
+                            .binaryFileUpload("template", TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
             HttpResponse<Buffer> postResp =
                     webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
             MatcherAssert.assertThat(postResp.statusCode(), Matchers.equalTo(200));
@@ -115,13 +115,18 @@ public void testPostedTemplateIsSanitizedAndCanBeDeleted() throws Exception {
                 JsonObject json = (JsonObject) o;
                 foundSanitizedTemplate =
                         foundSanitizedTemplate
-                                || json.getString("name").equals("Template_To_Sanitize");
+                                || json.getString("name").equals("Custom Event Template");
             }
             Assertions.assertTrue(foundSanitizedTemplate);
         } finally {
             webClient
                     .extensions()
-                    .delete(REQ_URL + "/Template_To_Sanitize", REQUEST_TIMEOUT_SECONDS);
+                    .delete(
+                            String.format(
+                                    "%s/%s",
+                                    REQ_URL,
+                                    URLEncodedUtils.formatSegments("/Template_To_Sanitize")),
+                            REQUEST_TIMEOUT_SECONDS);
         }
     }
 }
diff --git a/src/test/resources/TemplateToSanitize.jfc b/src/test/resources/CustomEventTemplate.jfc
similarity index 99%
rename from src/test/resources/TemplateToSanitize.jfc
rename to src/test/resources/CustomEventTemplate.jfc
index 320bd07dd..fc5d05600 100644
--- a/src/test/resources/TemplateToSanitize.jfc
+++ b/src/test/resources/CustomEventTemplate.jfc
@@ -5,7 +5,7 @@
      see Window -> Flight Recorder Template Manager.
 -->
 
-<configuration version="2.0" label="Template To Sanitize" description="Template with multiple words in label/name" provider="Cryostat">
+<configuration version="2.0" label="Custom Event Template" description="Custom event template with multiple words in label/name" provider="Cryostat">
 
     <event name="jdk.ThreadAllocationStatistics">
       <setting name="enabled">true</setting>
diff --git a/src/test/resources/invalidTemplate.xml b/src/test/resources/invalidTemplate.xml
new file mode 100644
index 000000000..2b79f4dc1
--- /dev/null
+++ b/src/test/resources/invalidTemplate.xml
@@ -0,0 +1 @@
+This is not valid xml.

From a356191ef7d195b8793ea8f9b7740442832a500a Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Fri, 16 Feb 2024 16:35:55 -0500
Subject: [PATCH 44/44] simplified implementation, got tests working

---
 .../io/cryostat/events/EventTemplates.java    | 44 +++-------
 .../io/cryostat/events/S3TemplateService.java |  2 +-
 .../java/itest/CustomEventTemplateTest.java   | 88 +++++++++----------
 3 files changed, 56 insertions(+), 78 deletions(-)

diff --git a/src/main/java/io/cryostat/events/EventTemplates.java b/src/main/java/io/cryostat/events/EventTemplates.java
index 4f1c0b159..c778d25bd 100644
--- a/src/main/java/io/cryostat/events/EventTemplates.java
+++ b/src/main/java/io/cryostat/events/EventTemplates.java
@@ -15,21 +15,20 @@
  */
 package io.cryostat.events;
 
-import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
+import io.cryostat.core.sys.FileSystem;
+import io.cryostat.core.templates.MutableTemplateService.InvalidEventTemplateException;
+import io.cryostat.core.templates.MutableTemplateService.InvalidXmlException;
 import io.cryostat.core.templates.Template;
 import io.cryostat.core.templates.TemplateType;
 import io.cryostat.targets.Target;
 import io.cryostat.util.HttpMimeType;
 
 import io.smallrye.common.annotation.Blocking;
-import io.smallrye.mutiny.Uni;
-import io.vertx.core.Vertx;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.BadRequestException;
@@ -58,7 +57,7 @@ public class EventTemplates {
                     "Cryostat",
                     TemplateType.TARGET);
 
-    @Inject Vertx vertx;
+    @Inject FileSystem fs;
     @Inject TargetTemplateService.Factory targetTemplateServiceFactory;
     @Inject S3TemplateService customTemplateService;
     @Inject Logger logger;
@@ -86,30 +85,15 @@ public Response postTemplatesV1(@RestForm("template") FileUpload body) {
     @POST
     @Path("/api/v3/event_templates")
     @RolesAllowed("write")
-    public Uni<Void> postTemplates(@RestForm("template") FileUpload body) {
-        CompletableFuture<Void> cf = new CompletableFuture<>();
-        var path = body.filePath();
-        vertx.fileSystem()
-                .readFile(path.toString())
-                .onComplete(
-                        ar -> {
-                            var str = ar.result().toString();
-                            try (var stream =
-                                    new ByteArrayInputStream(
-                                            str.getBytes(StandardCharsets.UTF_8))) {
-                                customTemplateService.addTemplate(stream);
-                                cf.complete(null);
-                            } catch (Exception e) {
-                                logger.error(e);
-                                cf.completeExceptionally(e);
-                            }
-                        })
-                .onFailure(
-                        ar -> {
-                            logger.error(ar.getCause());
-                            cf.completeExceptionally(ar.getCause());
-                        });
-        return Uni.createFrom().future(cf);
+    public void postTemplates(@RestForm("template") FileUpload body) throws IOException {
+        if (body == null || body.filePath() == null || !"template".equals(body.name())) {
+            throw new BadRequestException();
+        }
+        try (var stream = fs.newInputStream(body.filePath())) {
+            customTemplateService.addTemplate(stream);
+        } catch (InvalidEventTemplateException | InvalidXmlException e) {
+            throw new BadRequestException(e);
+        }
     }
 
     @DELETE
diff --git a/src/main/java/io/cryostat/events/S3TemplateService.java b/src/main/java/io/cryostat/events/S3TemplateService.java
index 6abf8dbc2..f71171bce 100644
--- a/src/main/java/io/cryostat/events/S3TemplateService.java
+++ b/src/main/java/io/cryostat/events/S3TemplateService.java
@@ -264,7 +264,7 @@ public Template addTemplate(InputStream stream)
                                 "Template has no configuration label attribute"));
             }
 
-            String templateName = labelAttr.getExplicitValue();
+            String templateName = labelAttr.getExplicitValue().replaceAll("[\\W]+", "_");
 
             XMLTagInstance root = model.getRoot();
             root.setValue(JFCGrammar.ATTRIBUTE_LABEL_MANDATORY, templateName);
diff --git a/src/test/java/itest/CustomEventTemplateTest.java b/src/test/java/itest/CustomEventTemplateTest.java
index 557a94340..94c8e7a02 100644
--- a/src/test/java/itest/CustomEventTemplateTest.java
+++ b/src/test/java/itest/CustomEventTemplateTest.java
@@ -15,8 +15,7 @@
  */
 package itest;
 
-import java.io.File;
-
+import io.quarkus.test.junit.DisabledOnIntegrationTest;
 import io.quarkus.test.junit.QuarkusTest;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
@@ -27,11 +26,10 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
-@Disabled("TODO")
+@DisabledOnIntegrationTest("classpath resources are not loadable in integration test")
 public class CustomEventTemplateTest extends StandardSelfTest {
 
     static final String INVALID_TEMPLATE_FILE_NAME = "invalidTemplate.xml";
@@ -43,37 +41,33 @@ public class CustomEventTemplateTest extends StandardSelfTest {
     @Test
     public void shouldThrowIfTemplateUploadNameInvalid() throws Exception {
         ClassLoader classLoader = getClass().getClassLoader();
-        File invalidTemplate =
-                new File(classLoader.getResource(INVALID_TEMPLATE_FILE_NAME).getFile());
-        String path = invalidTemplate.getAbsolutePath();
-
-        MultipartForm form =
-                MultipartForm.create()
-                        .attribute("invalidTemplateAttribute", INVALID_TEMPLATE_FILE_NAME)
-                        .binaryFileUpload(
-                                TEMPLATE_NAME, INVALID_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
+        try (var stream = classLoader.getResourceAsStream(INVALID_TEMPLATE_FILE_NAME)) {
+            var buf = Buffer.buffer(stream.readAllBytes());
+            MultipartForm form =
+                    MultipartForm.create()
+                            .binaryFileUpload(
+                                    TEMPLATE_NAME, INVALID_TEMPLATE_FILE_NAME, buf, MEDIA_TYPE);
 
-        HttpResponse<Buffer> resp =
-                webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
-        MatcherAssert.assertThat(resp.statusCode(), Matchers.equalTo(400));
+            HttpResponse<Buffer> resp =
+                    webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
+            MatcherAssert.assertThat(resp.statusCode(), Matchers.equalTo(400));
+        }
     }
 
     @Test
     public void shouldThrowWhenPostingInvalidTemplate() throws Exception {
         ClassLoader classLoader = getClass().getClassLoader();
-        File invalidTemplate =
-                new File(classLoader.getResource(INVALID_TEMPLATE_FILE_NAME).getFile());
-        String path = invalidTemplate.getAbsolutePath();
-
-        MultipartForm form =
-                MultipartForm.create()
-                        .attribute("template", INVALID_TEMPLATE_FILE_NAME)
-                        .binaryFileUpload(
-                                TEMPLATE_NAME, INVALID_TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
+        try (var stream = classLoader.getResourceAsStream(INVALID_TEMPLATE_FILE_NAME)) {
+            var buf = Buffer.buffer(stream.readAllBytes());
+            MultipartForm form =
+                    MultipartForm.create()
+                            .binaryFileUpload(
+                                    TEMPLATE_NAME, INVALID_TEMPLATE_FILE_NAME, buf, MEDIA_TYPE);
 
-        HttpResponse<Buffer> resp =
-                webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
-        MatcherAssert.assertThat(resp.statusCode(), Matchers.equalTo(400));
+            HttpResponse<Buffer> resp =
+                    webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
+            MatcherAssert.assertThat(resp.statusCode(), Matchers.equalTo(400));
+        }
     }
 
     @Test
@@ -88,19 +82,16 @@ public void testDeleteRecordingThrowsOnNonExistentTemplate() throws Exception {
     }
 
     @Test
-    public void testPostedTemplateCanBeDeleted() throws Exception {
-        try {
-            ClassLoader classLoader = getClass().getClassLoader();
-            File customEventTemplate =
-                    new File(classLoader.getResource(TEMPLATE_FILE_NAME).getFile());
-            String path = customEventTemplate.getAbsolutePath();
+    public void testPostedTemplateNameIsSanitizedAndCanBeDeleted() throws Exception {
+        ClassLoader classLoader = getClass().getClassLoader();
+        try (var stream = classLoader.getResourceAsStream(TEMPLATE_FILE_NAME)) {
+            var buf = Buffer.buffer(stream.readAllBytes());
             MultipartForm form =
                     MultipartForm.create()
-                            .attribute("template", TEMPLATE_FILE_NAME)
-                            .binaryFileUpload("template", TEMPLATE_FILE_NAME, path, MEDIA_TYPE);
+                            .binaryFileUpload("template", TEMPLATE_FILE_NAME, buf, MEDIA_TYPE);
             HttpResponse<Buffer> postResp =
                     webClient.extensions().post(REQ_URL, form, REQUEST_TIMEOUT_SECONDS);
-            MatcherAssert.assertThat(postResp.statusCode(), Matchers.equalTo(200));
+            MatcherAssert.assertThat(postResp.statusCode(), Matchers.equalTo(204));
 
             HttpResponse<Buffer> getResp =
                     webClient
@@ -113,20 +104,23 @@ public void testPostedTemplateCanBeDeleted() throws Exception {
             boolean foundSanitizedTemplate = false;
             for (Object o : getResp.bodyAsJsonArray()) {
                 JsonObject json = (JsonObject) o;
+                var name = json.getString("name");
                 foundSanitizedTemplate =
-                        foundSanitizedTemplate
-                                || json.getString("name").equals("Custom Event Template");
+                        foundSanitizedTemplate || name.equals("Custom_Event_Template");
             }
             Assertions.assertTrue(foundSanitizedTemplate);
         } finally {
-            webClient
-                    .extensions()
-                    .delete(
-                            String.format(
-                                    "%s/%s",
-                                    REQ_URL,
-                                    URLEncodedUtils.formatSegments("/Template_To_Sanitize")),
-                            REQUEST_TIMEOUT_SECONDS);
+            var delResp =
+                    webClient
+                            .extensions()
+                            .delete(
+                                    String.format(
+                                            "%s%s",
+                                            REQ_URL,
+                                            URLEncodedUtils.formatSegments(
+                                                    "Custom_Event_Template")),
+                                    REQUEST_TIMEOUT_SECONDS);
+            MatcherAssert.assertThat(delResp.statusCode(), Matchers.equalTo(204));
         }
     }
 }