fix(presign): remove baseUri from reports and jfr-datasource, send full presigned URLs

Author: andrewazores

compose/jfr-datasource.yml

@@ -27,7 +27,6 @@ services:
         -Dcom.sun.management.jmxremote.authenticate=false
         -Dcom.sun.management.jmxremote.ssl=false
         -Dcom.sun.management.jmxremote.local.only=false
-      CRYOSTAT_STORAGE_BASE_URI: ${S3_ENDPOINT_ARCHIVES_BUCKET:-http://s3:8333}
     healthcheck:
       test: curl --fail http://localhost:8080/ || exit 1
       retries: 3

compose/reports.yml

@@ -30,7 +30,6 @@ services:
         -Dcom.sun.management.jmxremote.ssl=false
         -Dcom.sun.management.jmxremote.local.only=false
       QUARKUS_HTTP_PORT: 10001
-      CRYOSTAT_STORAGE_BASE_URI: ${S3_ENDPOINT_ARCHIVES_BUCKET:-http://s3:8333}
     healthcheck:
       test: curl --fail http://localhost:10001/ || exit 1
       retries: 3

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

@@ -1486,7 +1486,7 @@ private Uni<String> uploadPresignedToJFRDatasource(String jvmId, String filename
             throws URISyntaxException {
         var uri = getPresignedPath(jvmId, filename);
         return datasourceClient
-                .uploadPresigned(uri.getPath(), uri.getQuery())
+                .uploadPresigned(uri.toString())
                 .onItem()
                 .transform(
                         r -> {
@@ -1640,8 +1640,6 @@ Uni<Response> upload(
         @POST
         @jakarta.ws.rs.Path("/load_presigned")
         @Consumes(MediaType.MULTIPART_FORM_DATA)
-        Uni<Response> uploadPresigned(
-                @RestForm("path") @PartType(MediaType.TEXT_PLAIN) String path,
-                @RestForm("query") @PartType(MediaType.TEXT_PLAIN) String query);
+        Uni<Response> uploadPresigned(@RestForm("uri") @PartType(MediaType.TEXT_PLAIN) String uri);
     }
 }

src/main/java/io/cryostat/reports/ReportSidecarService.java

@@ -48,7 +48,6 @@ Uni<Map<String, AnalysisResult>> generate(
     @POST
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     Uni<Map<String, AnalysisResult>> generatePresigned(
-            @RestForm("path") @PartType(MediaType.TEXT_PLAIN) String path,
-            @RestForm("query") @PartType(MediaType.TEXT_PLAIN) String query,
+            @RestForm("uri") @PartType(MediaType.TEXT_PLAIN) String uri,
             @RestForm("filter") @PartType(MediaType.TEXT_PLAIN) String filter);
 }

src/main/java/io/cryostat/reports/ReportsServiceImpl.java

@@ -118,7 +118,7 @@ public Uni<Map<String, AnalysisResult>> reportFor(
                 logger.tracev(
                         "sidecar reportFor presigned archived recording {0} {1}", jvmId, filename);
                 var uri = getPresignedPath(jvmId, filename);
-                return sidecar.generatePresigned(uri.getPath(), uri.getQuery(), filter);
+                return sidecar.generatePresigned(uri.toString(), filter);
             } else {
                 InputStream stream = helper.getArchivedRecordingStream(jvmId, filename);
                 logger.tracev("sidecar reportFor archived recording {0} {1}", jvmId, filename);

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

@@ -30,11 +30,7 @@ public class ReportsSidecarResource
     private static final int REPORTS_PORT = 10001;
     private static final String IMAGE_NAME = "quay.io/cryostat/cryostat-reports:latest";
     private static final Map<String, String> envMap =
-            Map.of(
-                    "QUARKUS_HTTP_PORT", String.valueOf(REPORTS_PORT),
-                    // TODO localhost:8333 should be dynamically set to the host and port of the
-                    // S3StorageResource
-                    "CRYOSTAT_STORAGE_BASE_URI", String.format("http://%s:%d", "localhost", 8333));
+            Map.of("QUARKUS_HTTP_PORT", String.valueOf(REPORTS_PORT));
 
     private Optional<String> containerNetworkId;
     private GenericContainer<?> container;