From: Tom Clegg <tom@curoverse.com>
Date: Thu, 12 Jan 2017 23:03:30 +0000 (-0500)
Subject: 10877: Configurable base URL for Azure storage, e.g., StorageBaseURL: core.usgovcloud... 
X-Git-Tag: 1.1.0~473^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6b30f7c9a223cc1d22974085f6df7aa62393cc55?ds=sidebyside;hp=1d19121f1216a20fa5083ada76d5b77f7901a9d5

10877: Configurable base URL for Azure storage, e.g., StorageBaseURL: core.usgovcloudapi.net
---

diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go
index 4839e3f682..a28f8b7f73 100644
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@ -97,6 +97,7 @@ func init() {
 type AzureBlobVolume struct {
 	StorageAccountName    string
 	StorageAccountKeyFile string
+	StorageBaseURL        string // "" means default, "core.windows.net"
 	ContainerName         string
 	AzureReplication      int
 	ReadOnly              bool
@@ -136,7 +137,10 @@ func (v *AzureBlobVolume) Start() error {
 	if err != nil {
 		return err
 	}
-	v.azClient, err = storage.NewBasicClient(v.StorageAccountName, accountKey)
+	if v.StorageBaseURL == "" {
+		v.StorageBaseURL = storage.DefaultBaseURL
+	}
+	v.azClient, err = storage.NewClient(v.StorageAccountName, accountKey, v.StorageBaseURL, storage.DefaultAPIVersion, true)
 	if err != nil {
 		return fmt.Errorf("creating Azure storage client: %s", err)
 	}