Updating MSOpenTech/azure-sdk-for-go to latest master

Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
This commit is contained in:
Frederick F. Kautz IV 2015-03-23 21:57:24 -07:00
parent 60dedc5178
commit 11db8185bc
14 changed files with 20 additions and 18 deletions

6
Godeps/Godeps.json generated
View file

@ -1,6 +1,6 @@
{
"ImportPath": "github.com/docker/distribution",
"GoVersion": "go1.4.1",
"GoVersion": "go1.4.2",
"Packages": [
"./..."
],
@ -24,8 +24,8 @@
},
{
"ImportPath": "github.com/MSOpenTech/azure-sdk-for-go",
"Comment": "v1.2",
"Rev": "0fbd37144de3adc2aef74db867c0e15e41c7f74a"
"Comment": "v1.2-43-gd90753b",
"Rev": "d90753bcad2ed782fcead7392d1e831df29aa2bb"
},
{
"ImportPath": "github.com/Sirupsen/logrus",

View file

@ -56,33 +56,35 @@ type StorageServiceError struct {
// NewBasicClient constructs a StorageClient with given storage service name
// and key.
func NewBasicClient(accountName, accountKey string) (*StorageClient, error) {
func NewBasicClient(accountName, accountKey string) (StorageClient, error) {
return NewClient(accountName, accountKey, DefaultBaseUrl, DefaultApiVersion, defaultUseHttps)
}
// NewClient constructs a StorageClient. This should be used if the caller
// wants to specify whether to use HTTPS, a specific REST API version or a
// custom storage endpoint than Azure Public Cloud.
func NewClient(accountName, accountKey, blobServiceBaseUrl, apiVersion string, useHttps bool) (*StorageClient, error) {
func NewClient(accountName, accountKey, blobServiceBaseUrl, apiVersion string, useHttps bool) (StorageClient, error) {
var c StorageClient
if accountName == "" {
return nil, fmt.Errorf("azure: account name required")
return c, fmt.Errorf("azure: account name required")
} else if accountKey == "" {
return nil, fmt.Errorf("azure: account key required")
return c, fmt.Errorf("azure: account key required")
} else if blobServiceBaseUrl == "" {
return nil, fmt.Errorf("azure: base storage service url required")
return c, fmt.Errorf("azure: base storage service url required")
}
key, err := base64.StdEncoding.DecodeString(accountKey)
if err != nil {
return nil, err
return c, err
}
return &StorageClient{
return StorageClient{
accountName: accountName,
accountKey: key,
useHttps: useHttps,
baseUrl: blobServiceBaseUrl,
apiVersion: apiVersion}, nil
apiVersion: apiVersion,
}, nil
}
func (c StorageClient) getBaseUrl(service string) string {