jprdonnelly/kestra
1
0
Fork 0
mirror of https://github.com/kestra-io/kestra.git synced 2025-12-19 18:05:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(localstorage): nullable uris + added recursive directory creation in test suite

Browse Source
This commit is contained in:
brian.mulier
2023-11-08 14:59:29 +01:00
committed by brian-mulier-p
parent 1014bb833d
commit 76d8619d06
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/test/java/io/kestra/core/storage/StorageTestSuite.java
View File

@@ -742,6 +742,17 @@ public abstract class StorageTestSuite {
assertThat(attr.getType(), is(FileAttributes.FileType.Directory));
assertThat(attr.getLastModifiedTime(), notNullValue());
}
@Test
void createDirectoryShouldBeRecursive() throws IOException {
String prefix = IdUtils.create();
storageInterface.createDirectory(null, URI.create("/" + prefix + "/first/second/third"));
List<FileAttributes> list = storageInterface.list(null, URI.create("/" + prefix));
assertThat(list, contains(
hasProperty("fileName", is("first"))
));
}
//endregion
//region test MOVE

19
storage-local/src/main/java/io/kestra/storage/local/LocalStorage.java
View File

@@ -32,14 +32,19 @@ public class LocalStorage implements StorageInterface {
}
private Path getPath(String tenantId, URI uri) {
Path basePath = tenantId == null ? config.getBasePath().toAbsolutePath()
: Paths.get(config.getBasePath().toAbsolutePath().toString(), tenantId);
if(uri == null) {
return basePath;
}
parentTraversalGuard(uri);
return tenantId == null ? Paths.get(config.getBasePath().toAbsolutePath().toString(), uri.getPath())
: Paths.get(config.getBasePath().toAbsolutePath().toString(), tenantId, uri.getPath());
return Paths.get(basePath.toString(), uri.getPath());
}
@Override
public InputStream get(String tenantId, URI uri) throws IOException {
return new BufferedInputStream(new FileInputStream(getPath(tenantId, URI.create(uri.getPath()))
return new BufferedInputStream(new FileInputStream(getPath(tenantId, uri)
.toAbsolutePath()
.toString())
);
@@ -52,11 +57,11 @@ public class LocalStorage implements StorageInterface {
@Override
public List<FileAttributes> list(String tenantId, URI uri) throws IOException {
try (Stream<Path> stream = Files.list(getPath(tenantId, URI.create(uri.getPath())))) {
try (Stream<Path> stream = Files.list(getPath(tenantId, uri))) {
return stream
.map(throwFunction(file -> {
URI relative = URI.create(
getPath(tenantId, URI.create("")).relativize(
getPath(tenantId, null).relativize(
Path.of(file.toUri())
).toString()
);
@@ -71,7 +76,7 @@ public class LocalStorage implements StorageInterface {
@Override
public Long size(String tenantId, URI uri) throws IOException {
try {
return Files.size(getPath(tenantId, URI.create(uri.getPath())));
return Files.size(getPath(tenantId, uri));
} catch (NoSuchFileException e) {
throw new FileNotFoundException("Unable to find file at '" + uri + "'");
} catch (IOException e) {
@@ -148,7 +153,7 @@ public class LocalStorage implements StorageInterface {
@Override
public boolean delete(String tenantId, URI uri) throws IOException {
Path path = getPath(tenantId, URI.create(uri.getPath()));
Path path = getPath(tenantId, uri);
File file = path.toFile();
if (file.isDirectory()) {