From 4b52816935474dae614e4eed89edfbb8752e69c4 Mon Sep 17 00:00:00 2001 From: Marin Salinas Date: Wed, 3 Apr 2019 13:30:52 -0600 Subject: [PATCH] fix: go modules conflicts --- builder/amazon/ebssurrogate/builder.go | 2 +- builder/osc/bsu/builder.go | 2 +- builder/osc/bsusurrogate/builder.go | 2 +- builder/osc/bsuvolume/builder.go | 2 +- builder/osc/chroot/builder.go | 2 +- builder/osc/chroot/step_create_volume.go | 6 ++++++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index ad5126cc0..0c1219063 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -218,7 +218,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &awscommon.StepKeyPair{ Debug: b.config.PackerDebug, Comm: &b.config.RunConfig.Comm, - DebugKeyPath: fmt.Sprintf("ec2_%s", b.config.PackerBuildName), + DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName), }, &awscommon.StepSecurityGroup{ SecurityGroupFilter: b.config.SecurityGroupFilter, diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index f0d804d37..0c51768f3 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -80,7 +80,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { return nil, nil } -func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { +func (b *Builder) Run(ui packer.Ui, hook packer.Hook) (packer.Artifact, error) { clientConfig, err := b.config.Config() if err != nil { return nil, err diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index 1649fcede..bc6822b60 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -106,7 +106,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { } -func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { +func (b *Builder) Run(ui packer.Ui, hook packer.Hook) (packer.Artifact, error) { clientConfig, err := b.config.Config() if err != nil { return nil, err diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index 363e50faf..07e8b1441 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -82,7 +82,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { return nil, nil } -func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { +func (b *Builder) Run(ui packer.Ui, hook packer.Hook) (packer.Artifact, error) { clientConfig, err := b.config.Config() if err != nil { return nil, err diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go index f809ea219..c5bcf950d 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -183,7 +183,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { return warns, nil } -func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { +func (b *Builder) Run(ui packer.Ui, hook packer.Hook) (packer.Artifact, error) { if runtime.GOOS != "linux" { return nil, errors.New("The outscale-chroot builder only works on Linux environments.") } diff --git a/builder/osc/chroot/step_create_volume.go b/builder/osc/chroot/step_create_volume.go index 6944ceef9..7cc9d022f 100644 --- a/builder/osc/chroot/step_create_volume.go +++ b/builder/osc/chroot/step_create_volume.go @@ -36,6 +36,12 @@ func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) mu volTags, err := s.RootVolumeTags.OAPITags(s.Ctx, oapiconn.GetConfig().Region, state) + if err != nil { + state.Put("error", err) + ui.Error(err.Error()) + return multistep.ActionHalt + } + var createVolume *oapi.CreateVolumeRequest if config.FromScratch { rootVolumeType := osccommon.VolumeTypeGp2