From 7975c5e336474bbe68482d3683627741626cf936 Mon Sep 17 00:00:00 2001
From: Christopher Gerber <cgerber@periscope.com>
Date: Tue, 2 Feb 2016 08:36:36 -0600
Subject: [PATCH] Move CLIConfig instantiation inside of ProfileName check.

---
 builder/amazon/common/access_config.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go
index a4aed9bd5..83d0499a6 100644
--- a/builder/amazon/common/access_config.go
+++ b/builder/amazon/common/access_config.go
@@ -29,12 +29,6 @@ type AccessConfig struct {
 func (c *AccessConfig) Config() (*aws.Config, error) {
 	var creds *credentials.Credentials
 
-	profile := &CLIConfig{}
-	err := profile.Prepare(c.ProfileName)
-	if err != nil {
-		return nil, err
-	}
-
 	region, err := c.Region()
 	if err != nil {
 		return nil, err
@@ -46,6 +40,11 @@ func (c *AccessConfig) Config() (*aws.Config, error) {
 	}
 
 	if c.ProfileName != "" {
+        profile := &CLIConfig{}
+        err := profile.Prepare(c.ProfileName)
+        if err != nil {
+            return nil, err
+        }
 		creds = c.assumeRoleCreds(config, profile)
     } else {
 		creds = credentials.NewChainCredentials([]credentials.Provider{