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

remove code from bad merge

This commit is contained in:
Matthew Hooker 2017-06-09 11:07:29 -07:00
parent 624aaa2067
commit 3fb4162660
No known key found for this signature in database
GPG Key ID: 7B5F933D9CE8C6A1
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,12 +2,9 @@ package common
import ( import (
"fmt" "fmt"
"log"
"os"
"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/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"
@ -16,11 +13,8 @@ import (
// AccessConfig is for common configuration related to AWS access // AccessConfig is for common configuration related to AWS access
type AccessConfig struct { type AccessConfig struct {
AccessKey string `mapstructure:"access_key"` AccessKey string `mapstructure:"access_key"`
AssumeRoleArn string `mapstructure:"assume_role_arn"`
CustomEndpointEc2 string `mapstructure:"custom_endpoint_ec2"` CustomEndpointEc2 string `mapstructure:"custom_endpoint_ec2"`
ExternalID string `mapstructure:"external_id"`
MFACode string `mapstructure:"mfa_code"` MFACode string `mapstructure:"mfa_code"`
MFASerial string `mapstructure:"mfa_serial"`
ProfileName string `mapstructure:"profile"` ProfileName string `mapstructure:"profile"`
RawRegion string `mapstructure:"region"` RawRegion string `mapstructure:"region"`
SecretKey string `mapstructure:"secret_key"` SecretKey string `mapstructure:"secret_key"`
@ -41,25 +35,6 @@ func (c *AccessConfig) Session() (*session.Session, error) {
return nil, err return nil, err
} }
if c.AssumeRoleArn != "" {
var options []func(*stscreds.AssumeRoleProvider)
if c.MFACode != "" {
options = append(options, func(p *stscreds.AssumeRoleProvider) {
p.SerialNumber = aws.String(c.MFASerial)
p.TokenProvider = func() (string, error) {
return c.MFACode, nil
}
})
}
}
if c.ProfileName != "" {
err := os.Setenv("AWS_PROFILE", c.ProfileName)
if err != nil {
log.Printf("Set env error: %s", err)
}
}
config := aws.NewConfig().WithRegion(region).WithMaxRetries(11).WithCredentialsChainVerboseErrors(true) config := aws.NewConfig().WithRegion(region).WithMaxRetries(11).WithCredentialsChainVerboseErrors(true)
if c.CustomEndpointEc2 != "" { if c.CustomEndpointEc2 != "" {