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

Merge pull request #5762 from hashicorp/static_cred_error 

builder/aws: catch static credential errors early.
This commit is contained in:
Matthew Hooker 2018-01-04 14:38:43 -08:00 committed by GitHub
parent ea9c6e4f65 98c2a2d1f7
commit da93b7cf1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,17 +53,8 @@ func (c *AccessConfig) Session() (*session.Session, error) {
} }
if c.AccessKey != "" { if c.AccessKey != "" {
creds := credentials.NewChainCredentials( config = config.WithCredentials(
[]credentials.Provider{ credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, c.Token))
&credentials.StaticProvider{
Value: credentials.Value{
AccessKeyID: c.AccessKey,
SecretAccessKey: c.SecretKey,
SessionToken: c.Token,
},
},
})
config = config.WithCredentials(creds)
} }
opts := session.Options{ opts := session.Options{
@ -110,6 +101,14 @@ func (c *AccessConfig) metadataRegion() string {
func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error { func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
var errs []error var errs []error
// Either both access and secret key must be set or neither of them should
// be.
if (len(c.AccessKey) > 0) != (len(c.SecretKey) > 0) {
errs = append(errs,
fmt.Errorf("`access_key` and `secret_key` must both be either set or not set."))
}
if c.RawRegion != "" && !c.SkipValidation { if c.RawRegion != "" && !c.SkipValidation {
if valid := ValidateRegion(c.RawRegion); !valid { if valid := ValidateRegion(c.RawRegion); !valid {
errs = append(errs, fmt.Errorf("Unknown region: %s", c.RawRegion)) errs = append(errs, fmt.Errorf("Unknown region: %s", c.RawRegion))