Skip to content

Do not add a delimeter to enable reading root bucket data #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomas-sexenian merged 2 commits into from
Mar 1, 2024
Merged

Do not add a delimeter to enable reading root bucket data #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fce9adb
Do not add a delimeter to enable reading root bucket data
Feb 19, 2024
cf4473a
Merge branch 'master' into ReadS3RootData
tomas-sexenian Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,20 @@ public String getDirectory(String directoryName) {
}

public boolean existsDirectory(String directoryName) {
ListObjectsV2Request listObjectsRequest = new ListObjectsV2Request()
if (directoryName == null || directoryName.isEmpty() || directoryName.equals(".") || directoryName.equals("/"))
directoryName = "";
else
directoryName = StorageUtils.normalizeDirectoryName(directoryName);

ListObjectsV2Request listObjectsV2Request = new ListObjectsV2Request()
.withBucketName(bucket)
.withDelimiter(StorageUtils.DELIMITER)
.withPrefix(StorageUtils.normalizeDirectoryName(directoryName))
.withPrefix(directoryName)
.withMaxKeys(1);
return client.listObjectsV2(listObjectsRequest).getKeyCount() > 0;

if (!directoryName.isEmpty())
listObjectsV2Request = listObjectsV2Request.withDelimiter(StorageUtils.DELIMITER);

return client.listObjectsV2(listObjectsV2Request).getKeyCount() > 0;
}

public void createDirectory(String directoryName) {
Expand Down
27 changes: 21 additions & 6 deletions gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,12 +515,27 @@ public String getDirectory(String directoryName) {
}

public boolean existsDirectory(String directoryName) {
ListObjectsV2Request listObjectsRequest = ListObjectsV2Request.builder()
.bucket(bucket)
.delimiter(StorageUtils.DELIMITER)
.prefix(StorageUtils.normalizeDirectoryName(directoryName))
.maxKeys(1)
.build();
if (directoryName == null || directoryName.isEmpty() || directoryName.equals(".") || directoryName.equals("/"))
directoryName = "";
else
directoryName = StorageUtils.normalizeDirectoryName(directoryName);


ListObjectsV2Request listObjectsRequest;
if (!directoryName.isEmpty())
listObjectsRequest = ListObjectsV2Request.builder()
.bucket(bucket)
.prefix(directoryName)
.maxKeys(1)
.delimiter(StorageUtils.DELIMITER)
.build();
else
listObjectsRequest = ListObjectsV2Request.builder()
.bucket(bucket)
.prefix(directoryName)
.maxKeys(1)
.build();

return client.listObjectsV2(listObjectsRequest).keyCount() > 0;
}

Expand Down