builder/amazon: prefer token in config [GH-1544]

CHANGELOG.md

@@ -16,6 +16,7 @@ IMPROVEMENTS:
 BUG FIXES:
 
   * core: Fix loading plugins from pwd. [GH-1521]
+  * builder/amazon: Prefer token in config if given. [GH-1544]
   * builder/virtualbox: Can read VirtualBox version on FreeBSD. [GH-1570]
   * builder/virtualbox: More robust reading of guest additions URL. [GH-1509]
   * builder/vmware: Always remove floppies/drives. [GH-1504]

builder/amazon/common/access_config.go

@@ -26,7 +26,7 @@ func (c *AccessConfig) Auth() (aws.Auth, error) {
 		c.SecretKey = auth.SecretKey
 		c.Token = auth.Token
 	}
-	if auth.Token == "" && c.Token != "" {
+	if c.Token != "" {
 		auth.Token = c.Token
 	}