fix metadata tagging and querying for uploaded archived recordings

cryostatio · Mar 8, 2024 · e376c84 · e376c84
1 parent 4d37279
commit e376c84
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/io/cryostat/graphql/ArchivedRecordings.java b/src/main/java/io/cryostat/graphql/ArchivedRecordings.java
@@ -43,7 +43,12 @@ public class ArchivedRecordings {
     @Query("archivedRecordings")
     public TargetNodes.ArchivedRecordings listArchivedRecordings(ArchivedRecordingsFilter filter) {
         var r = new TargetNodes.ArchivedRecordings();
-        r.data = recordingHelper.listArchivedRecordings();
+        r.data =
+                recordingHelper
+                        .listArchivedRecordings(filter == null ? null : filter.sourceTarget)
+                        .stream()
+                        .filter(filter)
+                        .toList();
         r.aggregate = AggregateInfo.fromArchived(r.data);
         return r;
     }

diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -584,13 +584,12 @@ public List<S3Object> listArchivedRecordingObjects(String jvmId) {
     }
 
     @Blocking
-    public List<ArchivedRecording> listArchivedRecordings(Target target) {
-        return listArchivedRecordingObjects(target.jvmId).stream()
+    public List<ArchivedRecording> listArchivedRecordings(String jvmId) {
+        return listArchivedRecordingObjects(jvmId).stream()
                 .map(
                         item -> {
                             String path = item.key().strip();
                             String[] parts = path.split("/");
-                            String jvmId = parts[0];
                             String filename = parts[1];
                             Metadata metadata =
                                     getArchivedRecordingMetadata(jvmId, filename)
@@ -606,6 +605,11 @@ public List<ArchivedRecording> listArchivedRecordings(Target target) {
                 .toList();
     }
 
+    @Blocking
+    public List<ArchivedRecording> listArchivedRecordings(Target target) {
+        return listArchivedRecordings(target.jvmId);
+    }
+
     public ArchivedRecording archiveRecording(
             ActiveRecording activeRecording, String savename, Instant expiry) throws Exception {
         // AWS object key name guidelines advise characters to avoid (% so we should not pass url

diff --git a/src/main/java/io/cryostat/recordings/Recordings.java b/src/main/java/io/cryostat/recordings/Recordings.java
@@ -191,6 +191,8 @@ public Map<String, Object> upload(
         if (rawLabels != null) {
             rawLabels.getMap().forEach((k, v) -> labels.put(k, v.toString()));
         }
+        labels.put("jvmId", "uploads");
+        labels.put("connectUrl", "uploads");
         Metadata metadata = new Metadata(labels);
         return doUpload(recording, metadata, "uploads");
     }