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

Populate access and secret key for bundle_upload_command.

This commit is contained in:
Ian Glover 2015-08-13 14:58:15 +01:00
parent 641c8a2ea0
commit 1447af5e42
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builder/amazon/instance/step_upload_bundle.go
View File

@ -36,13 +36,24 @@ func (s *StepUploadBundle) Run(state multistep.StateBag) multistep.StepAction {
return multistep.ActionHalt return multistep.ActionHalt
} }
accessKey := config.AccessKey
secretKey := config.SecretKey
accessConfig, err := config.AccessConfig.Config()
if err == nil && accessKey == "" && secretKey == "" {
credentials, err := accessConfig.Credentials.Get()
if err == nil {
accessKey = credentials.AccessKeyID
secretKey = credentials.SecretAccessKey
}
}
config.ctx.Data = uploadCmdData{ config.ctx.Data = uploadCmdData{
AccessKey: config.AccessKey, AccessKey: accessKey,
BucketName: config.S3Bucket, BucketName: config.S3Bucket,
BundleDirectory: config.BundleDestination, BundleDirectory: config.BundleDestination,
ManifestPath: manifestPath, ManifestPath: manifestPath,
Region: region, Region: region,
SecretKey: config.SecretKey, SecretKey: secretKey,
} }
config.BundleUploadCommand, err = interpolate.Render(config.BundleUploadCommand, &config.ctx) config.BundleUploadCommand, err = interpolate.Render(config.BundleUploadCommand, &config.ctx)
if err != nil { if err != nil {