mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Handle missing container in more places 

References #606.
pull/727/head
Andrew Gaul 2024-11-10 12:49:29 -08:00
rodzic b02ce67c5a
commit 5272c79083
1 zmienionych plików z 16 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
src/main/java/org/gaul/s3proxy/azureblob/AzureBlobStore.java
Wyświetl plik

@ -310,9 +310,12 @@ public final class AzureBlobStore extends BaseBlobStore {
try {
blobStream = client.openInputStream(azureRange, conditions);
} catch (BlobStorageException bse) {
if (bse.getErrorCode() == BlobErrorCode.BLOB_NOT_FOUND) {
var code = bse.getErrorCode();
if (code == BlobErrorCode.BLOB_NOT_FOUND) {
throw new KeyNotFoundException(container, key, "");
} else if (bse.getErrorCode() == BlobErrorCode.CONDITION_NOT_MET) {
} else if (code == BlobErrorCode.CONTAINER_NOT_FOUND) {
throw new ContainerNotFoundException(container, "");
} else if (code == BlobErrorCode.CONDITION_NOT_MET) {
var request = HttpRequest.builder()
.method("GET")
.endpoint(endpoint)
@ -547,10 +550,17 @@ public final class AzureBlobStore extends BaseBlobStore {
@Override
public ContainerAccess getContainerAccess(String container) {
var client = blobServiceClient.getBlobContainerClient(container);
return client.getAccessPolicy().getBlobAccessType() ==
PublicAccessType.CONTAINER ?
ContainerAccess.PUBLIC_READ :
ContainerAccess.PRIVATE;
try {
return client.getAccessPolicy().getBlobAccessType() ==
PublicAccessType.CONTAINER ?
ContainerAccess.PUBLIC_READ :
ContainerAccess.PRIVATE;
} catch (BlobStorageException bse) {
if (bse.getErrorCode() == BlobErrorCode.CONTAINER_NOT_FOUND) {
throw new ContainerNotFoundException(container, "");
}
throw bse;
}
}
@Override