projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1d19121
)
10877: Configurable base URL for Azure storage, e.g., StorageBaseURL: core.usgovcloud...
author
Tom Clegg <tom@curoverse.com>
Thu, 12 Jan 2017 23:03:30 +0000
(18:03 -0500)
committer
Tom Clegg <tom@curoverse.com>
Thu, 12 Jan 2017 23:03:30 +0000
(18:03 -0500)
services/keepstore/azure_blob_volume.go
patch
|
blob
|
history
diff --git
a/services/keepstore/azure_blob_volume.go
b/services/keepstore/azure_blob_volume.go
index 4839e3f6828a98fc62f63925d843f3c42bb03db1..a28f8b7f732ba1c2df8e862b6fceb9d9b7aaf604 100644
(file)
--- 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
type AzureBlobVolume struct {
StorageAccountName string
StorageAccountKeyFile string
+ StorageBaseURL string // "" means default, "core.windows.net"
ContainerName string
AzureReplication int
ReadOnly bool
ContainerName string
AzureReplication int
ReadOnly bool
@@
-136,7
+137,10
@@
func (v *AzureBlobVolume) Start() error {
if err != nil {
return err
}
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)
}
if err != nil {
return fmt.Errorf("creating Azure storage client: %s", err)
}