From ce4c1d4f356776e238b5ce367c42f0a40f680855 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Tue, 9 Feb 2016 17:19:33 +0000 Subject: [PATCH] s3: Fix empty checks in auth --- s3/s3.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/s3/s3.go b/s3/s3.go index aed1c4f8e..f728830f3 100644 --- a/s3/s3.go +++ b/s3/s3.go @@ -235,7 +235,9 @@ func s3Connection(name string) (*s3.S3, *session.Session, error) { cred := credentials.NewChainCredentials(providers) switch { - case fs.ConfigFile.MustBool(name, "env_auth", false) && v.AccessKeyID == "" && v.SecretAccessKey == "": + case fs.ConfigFile.MustBool(name, "env_auth", false): + // No need for empty checks if "env_auth" is true + case v.AccessKeyID == "" && v.SecretAccessKey == "": // if no access key/secret and iam is explicitly disabled then fall back to anon interaction cred = credentials.AnonymousCredentials case v.AccessKeyID == "":