iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder/amazon/common: save access/secret key from env [GH-434]

This commit is contained in:
Mitchell Hashimoto 2013-09-18 13:59:23 -07:00
parent b3559b90fd
commit cf10fff7fa
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -16,6 +16,8 @@ BUG FIXES:
instance, etc.) disappears from under it. instance, etc.) disappears from under it.
* builder/amazon/instance: Exclude only contents of /tmp, not /tmp * builder/amazon/instance: Exclude only contents of /tmp, not /tmp
itself. [GH-437] itself. [GH-437]
* builder/amazon/instance: Make AccessKey/SecretKey available to bundle
command even when they come from the environment. [GH-434]
* builder/virtualbox: F1-F12 and delete scancodes now work. [GH-425] * builder/virtualbox: F1-F12 and delete scancodes now work. [GH-425]
* provisioner/puppet-masterless: Fix failure case when both facter vars * provisioner/puppet-masterless: Fix failure case when both facter vars
are used and prevent_sudo. [GH-415] are used and prevent_sudo. [GH-415]

9
builder/amazon/common/access_config.go
View File

@ -18,7 +18,14 @@ type AccessConfig struct {
// Auth returns a valid aws.Auth object for access to AWS services, or // Auth returns a valid aws.Auth object for access to AWS services, or
// an error if the authentication couldn't be resolved. // an error if the authentication couldn't be resolved.
func (c *AccessConfig) Auth() (aws.Auth, error) { func (c *AccessConfig) Auth() (aws.Auth, error) {
return aws.GetAuth(c.AccessKey, c.SecretKey) auth, err := aws.GetAuth(c.AccessKey, c.SecretKey)
if err == nil {
// Store the accesskey and secret that we got...
c.AccessKey = auth.AccessKey
c.SecretKey = auth.SecretKey
}
return auth, err
} }
// Region returns the aws.Region object for access to AWS services, requesting // Region returns the aws.Region object for access to AWS services, requesting