From f6c401a143911964c5abd07018f52900a5cf5d3a Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Tue, 19 Dec 2017 11:05:50 -0800 Subject: [PATCH] don't pass in accessconfig --- builder/amazon/chroot/builder.go | 2 -- builder/amazon/ebs/builder.go | 2 -- builder/amazon/ebssurrogate/builder.go | 2 -- builder/amazon/instance/builder.go | 2 -- post-processor/amazon-import/post-processor.go | 1 - 5 files changed, 9 deletions(-) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 9d3e8c63a..388061bee 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -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, diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 176c62d22..392162652 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -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, diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 1ffbcd80f..4831b8ba7 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -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, diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index f80daa954..59c329515 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -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, diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go index 982defe3f..c9cbd2077 100644 --- a/post-processor/amazon-import/post-processor.go +++ b/post-processor/amazon-import/post-processor.go @@ -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, },