From dcd13c937d3d3335c00ebd9a42b60f8f26fcb470 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 19 Jul 2023 06:46:46 +0300 Subject: [PATCH] azure: Avoid spurious changes in NetworkSecurityGroup --- .../azuretasks/networksecuritygroup.go | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/upup/pkg/fi/cloudup/azuretasks/networksecuritygroup.go b/upup/pkg/fi/cloudup/azuretasks/networksecuritygroup.go index fdb5abdacb..cd79ac684d 100644 --- a/upup/pkg/fi/cloudup/azuretasks/networksecuritygroup.go +++ b/upup/pkg/fi/cloudup/azuretasks/networksecuritygroup.go @@ -79,17 +79,21 @@ func (nsg *NetworkSecurityGroup) Find(c *fi.CloudupContext) (*NetworkSecurityGro } for _, rule := range *found.SecurityRules { nsr := &NetworkSecurityRule{ - Name: rule.Name, - Priority: rule.Priority, - Access: rule.Access, - Direction: rule.Direction, - Protocol: rule.Protocol, - SourceAddressPrefix: rule.SourceAddressPrefix, - SourceAddressPrefixes: rule.SourceAddressPrefixes, - SourcePortRange: rule.SourcePortRange, - DestinationAddressPrefix: rule.DestinationAddressPrefix, - DestinationAddressPrefixes: rule.DestinationAddressPrefixes, - DestinationPortRange: rule.DestinationPortRange, + Name: rule.Name, + Priority: rule.Priority, + Access: rule.Access, + Direction: rule.Direction, + Protocol: rule.Protocol, + SourceAddressPrefix: rule.SourceAddressPrefix, + SourcePortRange: rule.SourcePortRange, + DestinationAddressPrefix: rule.DestinationAddressPrefix, + DestinationPortRange: rule.DestinationPortRange, + } + if rule.SourceAddressPrefixes != nil && len(*rule.SourceAddressPrefixes) > 0 { + nsr.SourceAddressPrefixes = rule.SourceAddressPrefixes + } + if rule.DestinationAddressPrefixes != nil && len(*rule.DestinationAddressPrefixes) > 0 { + nsr.DestinationAddressPrefixes = rule.DestinationAddressPrefixes } actual.SecurityRules = append(actual.SecurityRules, nsr) }