Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion structurizr-onpremises/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ dependencies {
implementation 'com.amazonaws:aws-java-sdk-sts:1.12.783'

implementation 'com.azure:azure-storage-blob:12.30.0'
implementation 'com.azure:azure-identity:1.16.2'

implementation 'javax.cache:cache-api:1.1.1'
implementation 'org.ehcache:ehcache:3.10.8'
Expand Down Expand Up @@ -150,4 +151,4 @@ configurations.implementation {

configurations.all {
exclude group: "commons-logging", module: "commons-logging"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.azure.storage.blob.models.ListBlobsOptions;
import com.azure.storage.blob.specialized.BlockBlobClient;
import com.azure.storage.common.StorageSharedKeyCredential;
import com.azure.identity.DefaultAzureCredentialBuilder;
import com.structurizr.onpremises.configuration.Configuration;
import com.structurizr.onpremises.domain.Image;
import com.structurizr.onpremises.domain.InputStreamAndContentLength;
Expand Down Expand Up @@ -50,12 +51,16 @@ public class AzureBlobStorageWorkspaceDao extends AbstractWorkspaceDao {
}

private BlobContainerClient createBlobContainerClient() {
StorageSharedKeyCredential credential = new StorageSharedKeyCredential(accountName, accessKey);

BlobServiceClient blobServiceClient = new BlobServiceClientBuilder()
.endpoint(String.format("https://%s.blob.core.windows.net/", accountName))
.credential(credential)
.buildClient();
BlobServiceClientBuilder builder = new BlobServiceClientBuilder()
.endpoint(String.format("https://%s.blob.core.windows.net/", accountName));

if (accessKey != null && !accessKey.isEmpty()) {
builder.credential(new StorageSharedKeyCredential(accountName, accessKey));
} else {
builder.credential(new DefaultAzureCredentialBuilder().build());
}

BlobServiceClient blobServiceClient = builder.buildClient();

return blobServiceClient.getBlobContainerClient(containerName);
}
Expand Down