From 10dd914f2fe13a464ef52aa83ee4e4bcb34496d9 Mon Sep 17 00:00:00 2001 From: grimmrimmer Date: Fri, 11 Aug 2023 14:01:52 -0500 Subject: [PATCH] ebs: skip_create_ami skips prevalidation of AMI name (#409) --- builder/common/step_pre_validate.go | 6 ++++++ builder/ebs/builder.go | 1 + 2 files changed, 7 insertions(+) diff --git a/builder/common/step_pre_validate.go b/builder/common/step_pre_validate.go index ad96b07a5..ba83cacfb 100644 --- a/builder/common/step_pre_validate.go +++ b/builder/common/step_pre_validate.go @@ -24,6 +24,7 @@ type StepPreValidate struct { DestAmiName string ForceDeregister bool AMISkipBuildRegion bool + AMISkipCreateImage bool VpcId string SubnetId string HasSubnetFilter bool @@ -89,6 +90,11 @@ func (s *StepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul return multistep.ActionContinue } + if s.AMISkipCreateImage { + ui.Say("skip_create_ami was set; not prevalidating AMI name") + return multistep.ActionContinue + } + ec2conn := state.Get("ec2").(*ec2.EC2) // Validate VPC settings for non-default VPCs diff --git a/builder/ebs/builder.go b/builder/ebs/builder.go index d879bde08..8459b243a 100644 --- a/builder/ebs/builder.go +++ b/builder/ebs/builder.go @@ -290,6 +290,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook) DestAmiName: b.config.AMIName, ForceDeregister: b.config.AMIForceDeregister, AMISkipBuildRegion: b.config.AMISkipBuildRegion, + AMISkipCreateImage: b.config.AMISkipCreateImage, VpcId: b.config.VpcId, SubnetId: b.config.SubnetId, HasSubnetFilter: !b.config.SubnetFilter.Empty(),