IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-01-28 17:34:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Locking the NSG to only operate on one resource at a time in the create

Browse Source
This commit is contained in:
tombuildsstuff 2017-04-13 15:26:51 +01:00
parent 8939ac2256
commit b6866f2187
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builtin/providers/azurerm/resource_arm_virtual_network.go
View File

@ -97,6 +97,22 @@ func resourceArmVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) e
Tags: expandTags(tags), Tags: expandTags(tags),
} }
networkSecurityGroupNames := make([]string, 0)
for _, subnet := range *vnet.VirtualNetworkPropertiesFormat.Subnets {
if subnet.NetworkSecurityGroup != nil {
subnetId := *subnet.NetworkSecurityGroup.ID
id, err := parseAzureResourceID(subnetId)
if err != nil {
return fmt.Errorf("[ERROR] Unable to Parse Network Security Group ID '%s': %+v", subnetId, err)
}
nsgName := id.Path["networkSecurityGroups"]
networkSecurityGroupNames = append(networkSecurityGroupNames, nsgName)
}
}
azureRMVirtualNetworkLockNetworkSecurityGroups(&networkSecurityGroupNames)
defer azureRMVirtualNetworkUnlockNetworkSecurityGroups(&networkSecurityGroupNames)
_, err := vnetClient.CreateOrUpdate(resGroup, name, vnet, make(chan struct{})) _, err := vnetClient.CreateOrUpdate(resGroup, name, vnet, make(chan struct{}))
if err != nil { if err != nil {
return err return err
@ -182,6 +198,8 @@ func resourceArmVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) e
resGroup := id.ResourceGroup resGroup := id.ResourceGroup
name := id.Path["virtualNetworks"] name := id.Path["virtualNetworks"]
// TODO: lock any associated NSG's
_, err = vnetClient.Delete(resGroup, name, make(chan struct{})) _, err = vnetClient.Delete(resGroup, name, make(chan struct{}))
return err return err
@ -245,3 +263,14 @@ func resourceAzureSubnetHash(v interface{}) int {
} }
return hashcode.String(subnet) return hashcode.String(subnet)
} }
func azureRMVirtualNetworkUnlockNetworkSecurityGroups(networkSecurityGroupNames *[]string) {
for _, networkSecurityGroupName := range *networkSecurityGroupNames {
armMutexKV.Unlock(networkSecurityGroupName)
}
}
func azureRMVirtualNetworkLockNetworkSecurityGroups(networkSecurityGroupNames *[]string) {
for _, networkSecurityGroupName := range *networkSecurityGroupNames {
armMutexKV.Lock(networkSecurityGroupName)
}
}