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

aws: Drop undocumented option `profile` 

This was added in 883acb18fa to support
assume role and shared configuration file. This was never completed.
This commit is contained in:
Rickard von Essen 2017-03-06 17:10:39 +01:00 committed by Matthew Hooker
parent 5bc8edc3b2
commit 15f80dc5ab
No known key found for this signature in database
GPG Key ID: 7B5F933D9CE8C6A1
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,6 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/credentials/stscreds" "github.com/aws/aws-sdk-go/aws/credentials/stscreds"
"github.com/aws/aws-sdk-go/aws/defaults"
"github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/hashicorp/packer/template/interpolate" "github.com/hashicorp/packer/template/interpolate"
@ -36,6 +35,13 @@ type AccessConfig struct {
Token string `mapstructure:"token"` Token string `mapstructure:"token"`
Token string `mapstructure:"token"` Token string `mapstructure:"token"`
session *session.Session session *session.Session
AccessKey string `mapstructure:"access_key"`
SecretKey string `mapstructure:"secret_key"`
RawRegion string `mapstructure:"region"`
SkipValidation bool `mapstructure:"skip_region_validation"`
Token string `mapstructure:"token"`
MFACode string `mapstructure:"mfa_code"`
session *session.Session
} }
// Config returns a valid aws.Config object for access to AWS services, or // Config returns a valid aws.Config object for access to AWS services, or
@ -50,26 +56,6 @@ func (c *AccessConfig) Session() (*session.Session, error) {
return nil, err return nil, err
} }
config := aws.NewConfig().WithRegion(region).WithMaxRetries(11)
if c.CustomEndpointEc2 != "" {
config.Endpoint = &c.CustomEndpointEc2
}
creds = credentials.NewChainCredentials(
[]credentials.Provider{
&credentials.StaticProvider{
Value: credentials.Value{
AccessKeyID: c.AccessKey,
SecretAccessKey: c.SecretKey,
SessionToken: c.Token,
},
},
&credentials.EnvProvider{},
&credentials.SharedCredentialsProvider{
Profile: c.ProfileName,
},
defaults.RemoteCredProvider(*(defaults.Config()), defaults.Handlers()),
})
if c.AssumeRoleArn != "" { if c.AssumeRoleArn != "" {
var options []func(*stscreds.AssumeRoleProvider) var options []func(*stscreds.AssumeRoleProvider)
if c.MFACode != "" { if c.MFACode != "" {
@ -91,6 +77,9 @@ func (c *AccessConfig) Session() (*session.Session, error) {
config := aws.NewConfig().WithRegion(region).WithMaxRetries(11).WithCredentialsChainVerboseErrors(true) config := aws.NewConfig().WithRegion(region).WithMaxRetries(11).WithCredentialsChainVerboseErrors(true)
if c.CustomEndpointEc2 != "" {
config.Endpoint = &c.CustomEndpointEc2
}
if c.AccessKey != "" { if c.AccessKey != "" {
creds := credentials.NewChainCredentials( creds := credentials.NewChainCredentials(
[]credentials.Provider{ []credentials.Provider{
@ -151,15 +140,6 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
} }
} }
hasAssumeRoleArn := len(c.AssumeRoleArn) > 0
hasMFASerial := len(c.MFASerial) > 0
hasMFACode := len(c.MFACode) > 0
if hasAssumeRoleArn && (hasMFACode != hasMFASerial) {
// either both mfa code and serial must be set, or neither.
errs = append(errs, fmt.Errorf("Both mfa_serial and mfa_code must be specified."))
}
if len(errs) > 0 { if len(errs) > 0 {
return errs return errs
} }