better pre-delete checks, emit full template description on notification

cryostatio · Feb 21, 2024 · 74eebe3 · 74eebe3
1 parent bca3ec9
commit 74eebe3
Showing 1 changed file with 19 additions and 10 deletions.
diff --git 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(