fix: proper url when tenant is null (#80)

kestra-io · Oct 12, 2023 · 2be9c15 · 2be9c15
1 parent 561e351
commit 2be9c15
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/src/main/java/io/kestra/storage/gcs/GcsStorage.java b/src/main/java/io/kestra/storage/gcs/GcsStorage.java
@@ -38,7 +38,13 @@ private Storage client() {
     }
 
     private BlobId blob(String tenantId, URI uri) {
-        return BlobId.of(this.config.getBucket(), tenantId + uri.getPath());
+        String path;
+        if (tenantId != null) {
+            path = tenantId + uri.getPath();
+        } else {
+            path = uri.getPath().substring(1);
+        }
+        return BlobId.of(this.config.getBucket(), path);
     }
 
     @Override
@@ -135,9 +141,16 @@ public List<URI> deleteByPrefix(String tenantId, URI storagePrefix) throws IOExc
             StorageBatch batch = this.client().batch();
             Map<URI, StorageBatchResult<Boolean>> results = new HashMap<>();
 
+            String prefix;
+            if (tenantId != null) {
+                prefix = tenantId + storagePrefix.getPath();
+            } else {
+                prefix = storagePrefix.getPath().substring(1);
+            }
+
             Page<Blob> blobs = this.client()
                 .list(this.config.getBucket(),
-                    Storage.BlobListOption.prefix(tenantId + storagePrefix.getPath())
+                    Storage.BlobListOption.prefix(prefix)
                 );
 
             for (Blob blob : blobs.iterateAll()) {

diff --git a/src/test/java/io/kestra/storage/gcs/GcsStorageTest.java b/src/test/java/io/kestra/storage/gcs/GcsStorageTest.java
@@ -41,6 +41,18 @@ void get() throws Exception {
         String prefix = IdUtils.create();
         String tenantId = IdUtils.create();
 
+        get(tenantId, prefix);
+    }
+
+    @Test
+    void getNoTenant() throws Exception {
+        String prefix = IdUtils.create();
+        String tenantId = null;
+
+        get(tenantId, prefix);
+    }
+
+    private void get(String tenantId, String prefix) throws Exception {
         URL resource = GcsStorageTest.class.getClassLoader().getResource("application.yml");
         String content = CharStreams.toString(new InputStreamReader(new FileInputStream(Objects.requireNonNull(resource).getFile())));
 
@@ -104,6 +116,18 @@ void deleteByPrefix() throws Exception {
         String prefix = IdUtils.create();
         String tenantId = IdUtils.create();
 
+        deleteByPrefix(prefix, tenantId);
+    }
+
+    @Test
+    void deleteByPrefixNoTenant() throws Exception {
+        String prefix = IdUtils.create();
+        String tenantId = IdUtils.create();
+
+        deleteByPrefix(prefix, tenantId);
+    }
+
+    private void deleteByPrefix(String prefix, String tenantId) throws Exception {
         URL resource = GcsStorageTest.class.getClassLoader().getResource("application.yml");
 
         List<String> path = Arrays.asList(