From b4efd13a4d69a937a22caa5dd84eb98f7fdce5cf Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 13 Mar 2020 17:17:24 +0100 Subject: [PATCH] aws: use the empty func when possible --- builder/amazon/ebs/builder.go | 2 +- builder/amazon/ebssurrogate/builder.go | 2 +- builder/amazon/instance/builder.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 6d3e7f89a..7ae72b906 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -211,7 +211,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack AMISkipBuildRegion: b.config.AMISkipBuildRegion, VpcId: b.config.VpcId, SubnetId: b.config.SubnetId, - HasSubnetFilter: len(b.config.SubnetFilter.Filters) > 0, + HasSubnetFilter: !b.config.SubnetFilter.Empty(), }, &awscommon.StepSourceAMIInfo{ SourceAmi: b.config.SourceAmi, diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 1a94b7c28..e0373a172 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -234,7 +234,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ForceDeregister: b.config.AMIForceDeregister, VpcId: b.config.VpcId, SubnetId: b.config.SubnetId, - HasSubnetFilter: len(b.config.SubnetFilter.Filters) > 0, + HasSubnetFilter: !b.config.SubnetFilter.Empty(), }, &awscommon.StepSourceAMIInfo{ SourceAmi: b.config.SourceAmi, diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 763960150..cad338300 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -296,7 +296,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack ForceDeregister: b.config.AMIForceDeregister, VpcId: b.config.VpcId, SubnetId: b.config.SubnetId, - HasSubnetFilter: len(b.config.SubnetFilter.Filters) > 0, + HasSubnetFilter: !b.config.SubnetFilter.Empty(), }, &awscommon.StepSourceAMIInfo{ SourceAmi: b.config.SourceAmi,