From a994f208a6ab576261721735e4283e7a01759d00 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 30 Sep 2019 14:53:57 -0400 Subject: [PATCH] Use default Azure storage endpoint if configured value is "". This is the documented behavior. refs #13647 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/keepstore/azure_blob_volume.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go index 6806c8c6ce..50a8edcbb7 100644 --- a/services/keepstore/azure_blob_volume.go +++ b/services/keepstore/azure_blob_volume.go @@ -34,7 +34,6 @@ func init() { func newAzureBlobVolume(cluster *arvados.Cluster, volume arvados.Volume, logger logrus.FieldLogger, metrics *volumeMetricsVecs) (Volume, error) { v := &AzureBlobVolume{ - StorageBaseURL: storage.DefaultBaseURL, RequestTimeout: azureDefaultRequestTimeout, WriteRaceInterval: azureDefaultWriteRaceInterval, WriteRacePollTime: azureDefaultWriteRacePollTime, @@ -53,6 +52,9 @@ func newAzureBlobVolume(cluster *arvados.Cluster, volume arvados.Volume, logger if v.ListBlobsMaxAttempts == 0 { v.ListBlobsMaxAttempts = azureDefaultListBlobsMaxAttempts } + if v.StorageBaseURL == "" { + v.StorageBaseURL = storage.DefaultBaseURL + } if v.ContainerName == "" || v.StorageAccountName == "" || v.StorageAccountKey == "" { return nil, errors.New("DriverParameters: ContainerName, StorageAccountName, and StorageAccountKey must be provided") } -- 2.30.2