[ARVADOS] created: 6b30f7c9a223cc1d22974085f6df7aa62393cc55

Git user git at public.curoverse.com
Thu Jan 12 18:06:36 EST 2017


        at  6b30f7c9a223cc1d22974085f6df7aa62393cc55 (commit)


commit 6b30f7c9a223cc1d22974085f6df7aa62393cc55
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 12 18:03:30 2017 -0500

    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 4839e3f..a28f8b7 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)
 	}

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list