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

don't pass in accessconfig

This commit is contained in:
Matthew Hooker 2017-12-19 11:05:50 -08:00
parent 1c352726d7
commit f6c401a143
No known key found for this signature in database
GPG Key ID: 7B5F933D9CE8C6A1
5 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/amazon/chroot/builder.go
View File

@ -281,7 +281,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Ctx: b.config.ctx,
},
&awscommon.StepCreateTags{
AccessConfig: &b.config.AccessConfig,
Tags: b.config.AMITags,
SnapshotTags: b.config.SnapshotTags,
Ctx: b.config.ctx,
@ -304,7 +303,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
// Build the artifact and return it
artifact := &awscommon.Artifact{
AccessConfig: &b.config.AccessConfig,
Amis: state.Get("amis").(map[string]string),
BuilderIdValue: BuilderId,
Conn: ec2conn,

2
builder/amazon/ebs/builder.go
View File

@ -245,7 +245,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Ctx: b.config.ctx,
},
&awscommon.StepCreateTags{
AccessConfig: &b.config.AccessConfig,
Tags: b.config.AMITags,
SnapshotTags: b.config.SnapshotTags,
Ctx: b.config.ctx,
@ -268,7 +267,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
// Build the artifact and return it
artifact := &awscommon.Artifact{
AccessConfig: &b.config.AccessConfig,
Amis: state.Get("amis").(map[string]string),
BuilderIdValue: BuilderId,
Conn: ec2conn,

2
builder/amazon/ebssurrogate/builder.go
View File

@ -263,7 +263,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Ctx: b.config.ctx,
},
&awscommon.StepCreateTags{
AccessConfig: &b.config.AccessConfig,
Tags: b.config.AMITags,
SnapshotTags: b.config.SnapshotTags,
Ctx: b.config.ctx,
@ -282,7 +281,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
if amis, ok := state.GetOk("amis"); ok {
// Build the artifact and return it
artifact := &awscommon.Artifact{
AccessConfig: &b.config.AccessConfig,
Amis: amis.(map[string]string),
BuilderIdValue: BuilderId,
Conn: ec2conn,

2
builder/amazon/instance/builder.go
View File

@ -317,7 +317,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Ctx: b.config.ctx,
},
&awscommon.StepCreateTags{
AccessConfig: &b.config.AccessConfig,
Tags: b.config.AMITags,
SnapshotTags: b.config.SnapshotTags,
Ctx: b.config.ctx,
@ -340,7 +339,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
// Build the artifact and return it
artifact := &awscommon.Artifact{
AccessConfig: &b.config.AccessConfig,
Amis: state.Get("amis").(map[string]string),
BuilderIdValue: BuilderId,
Conn: ec2conn,

1
post-processor/amazon-import/post-processor.go
View File

@ -365,7 +365,6 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
// Add the reported AMI ID to the artifact list
log.Printf("Adding created AMI ID %s in region %s to output artifacts", createdami, *config.Region)
artifact = &awscommon.Artifact{
AccessConfig: &p.config.AccessConfig,
Amis: map[string]string{
*config.Region: createdami,
},