fix(archives): cannot delete archived recording (#176)

cryostatio · Nov 22, 2023 · 1036a16 · 1036a16
1 parent 82f8802
commit 1036a16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -75,7 +75,6 @@
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.ResponseBuilder;
 import jdk.jfr.RecordingState;
-import org.apache.commons.codec.binary.Base32;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -123,8 +122,6 @@ public class RecordingHelper {
  @Inject Clock clock;
  @Inject S3Presigner presigner;
 
- @Inject Base32 base32;
-
  @Inject
  @Named(Producers.BASE64_URL)
  Base64 base64Url;
@@ -570,10 +567,6 @@ private Optional<Metadata> getArchivedRecordingMetadata(String storageKey) {
  }
  }
 
- String decodeBase32(String encoded) {
- return new String(base32.decode(encoded), StandardCharsets.UTF_8);
- }
-
  String decodeBase64(String encoded) {
  return new String(base64Url.decode(encoded), StandardCharsets.UTF_8);
  }

diff --git a/src/main/java/io/cryostat/recordings/Recordings.java b/src/main/java/io/cryostat/recordings/Recordings.java
@@ -721,11 +721,10 @@ public void deleteRecording(@RestPath long targetId, @RestPath long remoteId) th
 
  @DELETE
  @Blocking
- @Path("/api/beta/fs/recordings/{encodedJvmId}/{filename}")
+ @Path("/api/beta/fs/recordings/{jvmId}/{filename}")
  @RolesAllowed("write")
- public void deleteArchivedRecording(@RestPath String encodedJvmId, @RestPath String filename)
+ public void deleteArchivedRecording(@RestPath String jvmId, @RestPath String filename)
  throws Exception {
- var jvmId = recordingHelper.decodeBase32(encodedJvmId);
  logger.infov("Handling archived recording deletion: {0} / {1}", jvmId, filename);
  var metadata =
  recordingHelper