From f0f3c430a80c88ece8a3e43908d37c942ce3d6b3 Mon Sep 17 00:00:00 2001 From: Maxime Bury Date: Wed, 17 Feb 2016 21:45:13 -0500 Subject: [PATCH] Generalize fix to ignore empty VPC config --- builtin/providers/aws/structure.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/providers/aws/structure.go b/builtin/providers/aws/structure.go index d257128b7..f033cb4a1 100644 --- a/builtin/providers/aws/structure.go +++ b/builtin/providers/aws/structure.go @@ -688,11 +688,14 @@ func flattenLambdaVpcConfigResponse(s *lambda.VpcConfigResponse) []map[string]in return nil } + // Empty + if len(s.SubnetIds) == 0 && len(s.SecurityGroupIds) == 0 && s.VpcId == nil { + return nil + } + settings["subnet_ids"] = schema.NewSet(schema.HashString, flattenStringList(s.SubnetIds)) settings["security_group_ids"] = schema.NewSet(schema.HashString, flattenStringList(s.SecurityGroupIds)) - if s.VpcId != nil { - settings["vpc_id"] = *s.VpcId - } + settings["vpc_id"] = *s.VpcId return []map[string]interface{}{settings} }