From 074be9942d6b96e247efcd9734ee6310ae795ac3 Mon Sep 17 00:00:00 2001 From: DanHam Date: Tue, 19 Nov 2019 14:05:24 +0000 Subject: [PATCH] Only validate the user has provided a subnet_id when vpc_id has been set --- builder/amazon/common/step_pre_validate.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go index ae0c6d41c..e11f122cc 100644 --- a/builder/amazon/common/step_pre_validate.go +++ b/builder/amazon/common/step_pre_validate.go @@ -121,8 +121,10 @@ func (s *StepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul } func (s *StepPreValidate) checkVpc(conn ec2iface.EC2API) error { - if s.VpcId != "" && s.SubnetId != "" { - // skip validation if both VpcId and SubnetId are provided; AWS API will error if something is wrong. + if s.VpcId == "" || (s.VpcId != "" && s.SubnetId != "") { + // Skip validation if: + // * The user has not provided a VpcId. + // * Both VpcId and SubnetId are provided; AWS API will error if something is wrong. return nil }