Merge pull request #1413 from BrianBland/updateGoamz
Updates docker/goamz dependency to support AWS profile env
This commit is contained in:
commit
2ad849704b
2 changed files with 10 additions and 4 deletions
6
Godeps/Godeps.json
generated
6
Godeps/Godeps.json
generated
|
@ -77,15 +77,15 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/docker/goamz/aws",
|
"ImportPath": "github.com/docker/goamz/aws",
|
||||||
"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8"
|
"Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/docker/goamz/cloudfront",
|
"ImportPath": "github.com/docker/goamz/cloudfront",
|
||||||
"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8"
|
"Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/docker/goamz/s3",
|
"ImportPath": "github.com/docker/goamz/s3",
|
||||||
"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8"
|
"Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/docker/libtrust",
|
"ImportPath": "github.com/docker/libtrust",
|
||||||
|
|
8
Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go
generated
vendored
8
Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go
generated
vendored
|
@ -405,7 +405,13 @@ func EnvAuth() (auth Auth, err error) {
|
||||||
// http://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs
|
// http://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs
|
||||||
func CredentialFileAuth(filePath string, profile string, expiration time.Duration) (auth Auth, err error) {
|
func CredentialFileAuth(filePath string, profile string, expiration time.Duration) (auth Auth, err error) {
|
||||||
if profile == "" {
|
if profile == "" {
|
||||||
profile = "default"
|
profile = os.Getenv("AWS_DEFAULT_PROFILE")
|
||||||
|
if profile == "" {
|
||||||
|
profile = os.Getenv("AWS_PROFILE")
|
||||||
|
if profile == "" {
|
||||||
|
profile = "default"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if filePath == "" {
|
if filePath == "" {
|
||||||
|
|
Loading…
Reference in a new issue