X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0bb53c1cbcbcb8b3be50e6ecf3fdf0bb7cbd96b5..fdd48c8ba17f4cc040ea7e7b9553cefc33717f4e:/services/keepstore/azure_blob_volume.go diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go index 6806c8c6ce..6e8def8222 100644 --- a/services/keepstore/azure_blob_volume.go +++ b/services/keepstore/azure_blob_volume.go @@ -21,8 +21,8 @@ import ( "sync/atomic" "time" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/ctxlog" "github.com/Azure/azure-sdk-for-go/storage" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" @@ -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") }