Skip to content

Commit 06b1b47

Browse files
authored
Fix null checks for network policies (#2377)
1 parent 499ab90 commit 06b1b47

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

vsphere/host_network_policy_structure.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,20 @@ func expandHostNetworkPolicy(d *schema.ResourceData) *types.HostNetworkPolicy {
272272
// flattenHostNetworkPolicy reads various fields from a HostNetworkPolicy into
273273
// the passed in ResourceData.
274274
func flattenHostNetworkPolicy(d *schema.ResourceData, obj *types.HostNetworkPolicy) error {
275-
if err := flattenHostNetworkSecurityPolicy(d, obj.Security); obj.Security != nil && err != nil {
276-
return err
275+
if obj.Security != nil {
276+
if err := flattenHostNetworkSecurityPolicy(d, obj.Security); err != nil {
277+
return err
278+
}
277279
}
278-
if err := flattenHostNicTeamingPolicy(d, obj.NicTeaming); obj.NicTeaming != nil && err != nil {
279-
return err
280+
if obj.NicTeaming != nil {
281+
if err := flattenHostNicTeamingPolicy(d, obj.NicTeaming); err != nil {
282+
return err
283+
}
280284
}
281-
if err := flattenHostNetworkTrafficShapingPolicy(d, obj.ShapingPolicy); obj.ShapingPolicy != nil && err != nil {
282-
return err
285+
if obj.ShapingPolicy != nil {
286+
if err := flattenHostNetworkTrafficShapingPolicy(d, obj.ShapingPolicy); err != nil {
287+
return err
288+
}
283289
}
284290
return nil
285291
}

0 commit comments

Comments
 (0)