fix: list properly returns metadata

kestra-io · Dec 9, 2024 · 5a5e1d2 · 5a5e1d2
1 parent 9ed5930
commit 5a5e1d2
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 25 deletions.
diff --git a/src/main/java/io/kestra/storage/s3/MetadataUtils.java b/src/main/java/io/kestra/storage/s3/MetadataUtils.java
@@ -0,0 +1,31 @@
+package io.kestra.storage.s3;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class MetadataUtils {
+    private static final Pattern METADATA_KEY_WORD_SEPARATOR = Pattern.compile("_([a-z])");
+    private static final Pattern UPPERCASE = Pattern.compile("([A-Z])");
+
+    public static Map<String, String> toStoredMetadata(Map<String, String> metadata) {
+        if (metadata == null) {
+            return null;
+        }
+        return metadata.entrySet().stream()
+            .map(entry -> Map.entry(UPPERCASE.matcher(entry.getKey()).replaceAll("_$1").toLowerCase(), entry.getValue()))
+            .collect(HashMap::new, (m, v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
+    }
+
+    public static Map<String, String> toRetrievedMetadata(Map<String, String> metadata) {
+        if (metadata == null) {
+            return null;
+        }
+        return metadata.entrySet().stream()
+            .map(entry -> Map.entry(
+                METADATA_KEY_WORD_SEPARATOR.matcher(entry.getKey())
+                    .replaceAll(matchResult -> matchResult.group(1).toUpperCase()),
+                entry.getValue()
+            )).collect(HashMap::new, (m, v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
+    }
+}
diff --git a/src/main/java/io/kestra/storage/s3/S3FileAttributes.java b/src/main/java/io/kestra/storage/s3/S3FileAttributes.java
@@ -8,12 +8,20 @@
 import java.util.Map;
 
 @Value
-@Builder
 public class S3FileAttributes implements FileAttributes {
-
     String fileName;
     HeadObjectResponse head;
     boolean isDirectory;
+    Map<String, String> metadata;
+
+    @Builder
+    public S3FileAttributes(String fileName, HeadObjectResponse head, boolean isDirectory) {
+        this.fileName = fileName;
+        this.head = head;
+        this.isDirectory = isDirectory;
+
+        this.metadata = MetadataUtils.toRetrievedMetadata(head.metadata());
+    }
 
     @Override
     public long getLastModifiedTime() {
@@ -48,6 +56,6 @@ public long getSize() {
 
     @Override
     public Map<String, String> getMetadata() {
-        return head.metadata();
+        return metadata;
     }
 }
diff --git a/src/main/java/io/kestra/storage/s3/S3Storage.java b/src/main/java/io/kestra/storage/s3/S3Storage.java
@@ -147,7 +147,7 @@ public StorageObject getWithMetadata(String tenantId, @Nullable String namespace
                 resultInputStream = InputStream.nullInputStream();
             }
 
-            return new StorageObject(toRetrievedMetadata(result.response().metadata()), resultInputStream);
+            return new StorageObject(MetadataUtils.toRetrievedMetadata(result.response().metadata()), resultInputStream);
         }catch (ExecutionException e) {
             if (e.getCause() instanceof S3Exception s3Exception && s3Exception.statusCode() == 404) {
                 throw new FileNotFoundException();
@@ -251,7 +251,7 @@ public URI put(String tenantId, @Nullable String namespace, URI uri, StorageObje
             PutObjectRequest request = PutObjectRequest.builder()
                 .bucket(this.getBucket())
                 .key(path)
-                .metadata(toStoredMetadata(storageObject.metadata()))
+                .metadata(MetadataUtils.toStoredMetadata(storageObject.metadata()))
                 .build();
 
             Optional<Upload> upload;
@@ -461,24 +461,4 @@ private void parentTraversalGuard(URI uri) {
     private static URI createUri(String tenantId, String key) {
         return URI.create("kestra://%s".formatted(key).replace(tenantId + "/", ""));
     }
-
-    private Map<String, String> toStoredMetadata(Map<String, String> metadata) {
-        if (metadata == null) {
-            return null;
-        }
-        return metadata.entrySet().stream()
-            .map(entry -> Map.entry(UPPERCASE.matcher(entry.getKey()).replaceAll("_$1").toLowerCase(), entry.getValue()))
-            .collect(HashMap::new, (m, v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
-    }
-    private Map<String, String> toRetrievedMetadata(Map<String, String> metadata) {
-        if (metadata == null) {
-            return null;
-        }
-        return metadata.entrySet().stream()
-            .map(entry -> Map.entry(
-                METADATA_KEY_WORD_SEPARATOR.matcher(entry.getKey())
-                    .replaceAll(matchResult -> matchResult.group(1).toUpperCase()),
-                entry.getValue()
-            )).collect(HashMap::new, (m, v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
-    }
 }