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

compose/cryostat.yml

@@ -25,6 +25,7 @@ services:
       QUARKUS_HTTP_PORT: ${CRYOSTAT_HTTP_PORT}
       QUARKUS_HIBERNATE_ORM_LOG_SQL: "true"
       STORAGE_METADATA_STORAGE_MODE: ${CRYOSTAT_STORAGE_MODE:-tagging}
+      STORAGE_BUCKETS_METADATA_NAME: ${CRYOSTAT_METADATA_BUCKET_NAME:-cryostatmeta}
       CRYOSTAT_DISCOVERY_JDP_ENABLED: ${CRYOSTAT_DISCOVERY_JDP_ENABLED:-true}
       CRYOSTAT_DISCOVERY_PODMAN_ENABLED: ${CRYOSTAT_DISCOVERY_PODMAN_ENABLED:-true}
       CRYOSTAT_DISCOVERY_DOCKER_ENABLED: ${CRYOSTAT_DISCOVERY_DOCKER_ENABLED:-true}

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: 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: http://s3:8333
     healthcheck:
       test: curl --fail http://localhost:10001/ || exit 1
       retries: 3

compose/s3-ext.yml

@@ -5,10 +5,9 @@ services:
       # before running the smoketest.bash script. The region should be overridden to match the
       # endpoint, if necessary. The storage mode should be changed if the selected object storage
       # provider does not support the object Tag API.
-      CRYOSTAT_ARCHIVED_RECORDINGS_METADATA_STORAGE_MODE: ${METADATA_STORAGE_MODE:-tagging}
       QUARKUS_S3_ENDPOINT_OVERRIDE: ${S3_ENDPOINT}
       # STORAGE_EXT_URL: /storage/
-      QUARKUS_S3_PATH_STYLE_ACCESS: "false"
+      QUARKUS_S3_PATH_STYLE_ACCESS: ${S3_PATH_STYLE_ACCESS:-false}
       QUARKUS_S3_AWS_REGION: ${S3_REGION:-us-east-1}
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}

smoketest.bash

@@ -17,7 +17,7 @@ PULL_IMAGES=${PULL_IMAGES:-true}
 KEEP_VOLUMES=${KEEP_VOLUMES:-false}
 OPEN_TABS=${OPEN_TABS:-false}
 
-PRECREATE_BUCKETS=${PRECREATE_BUCKETS:-archivedrecordings,archivedreports,eventtemplates,probes,threaddumps,heapdumps}
+PRECREATE_BUCKETS=${PRECREATE_BUCKETS:-metadata,archivedrecordings,archivedreports,eventtemplates,probes,threaddumps,heapdumps}
 
 LOG_LEVEL=0
 CRYOSTAT_HTTP_HOST=${CRYOSTAT_HTTP_HOST:-cryostat}

src/main/java/io/cryostat/events/S3TemplateService.java

@@ -23,6 +23,7 @@
 import java.nio.file.Path;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -249,7 +250,7 @@ private Template convertObject(S3Object object)
                 break;
             case METADATA:
                 var headReq = HeadObjectRequest.builder().bucket(bucket).key(object.key()).build();
-                var meta = storage.headObject(headReq).metadata();
+                var meta = new HashMap<>(storage.headObject(headReq).metadata());
                 label = Objects.requireNonNull(meta.get(META_KEY_NAME));
                 description = Objects.requireNonNull(meta.get(META_KEY_DESCRIPTION));
                 provider = Objects.requireNonNull(meta.get(META_KEY_PROVIDER));

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

@@ -1039,7 +1039,7 @@ public Optional<Metadata> getArchivedRecordingMetadata(String storageKey) {
                     if (!resp.hasMetadata()) {
                         return Optional.empty();
                     }
-                    return Optional.of(new Metadata(resp.metadata()));
+                    return Optional.of(new Metadata(new HashMap<>(resp.metadata())));
                 case BUCKET:
                     return metadataService.get().read(storageKey);
                 default:
@@ -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;