ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring the lockMultiple function out

This commit is contained in:
tombuildsstuff 2017-05-10 13:08:45 +01:00 committed by Paul Stack
parent 5bca873c41
commit 58ce4a7223
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/providers/azurerm/locks.go Normal file
View File

@ -0,0 +1,12 @@
package azurerm
func azureRMUnlockMultiple(names *[]string) {
for _, name := range *names {
armMutexKV.Unlock(name)
}
}
func azureRMLockMultiple(names *[]string) {
for _, name := range *names {
armMutexKV.Lock(name)
}
}

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

@ -109,8 +109,8 @@ func resourceArmVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) e
}
}
azureRMVirtualNetworkLockNetworkSecurityGroups(&networkSecurityGroupNames)
defer azureRMVirtualNetworkUnlockNetworkSecurityGroups(&networkSecurityGroupNames)
azureRMLockMultiple(&networkSecurityGroupNames)
defer azureRMUnlockMultiple(&networkSecurityGroupNames)
_, err := vnetClient.CreateOrUpdate(resGroup, name, vnet, make(chan struct{}))
if err != nil {
@ -202,8 +202,8 @@ func resourceArmVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) e
return fmt.Errorf("[ERROR] Error parsing Network Security Group ID's: %+v", err)
}
azureRMVirtualNetworkLockNetworkSecurityGroups(&nsgNames)
defer azureRMVirtualNetworkUnlockNetworkSecurityGroups(&nsgNames)
azureRMLockMultiple(&nsgNames)
defer azureRMUnlockMultiple(&nsgNames)
_, err = vnetClient.Delete(resGroup, name, make(chan struct{}))
@ -294,14 +294,3 @@ func expandAzureRmVirtualNetworkVirtualNetworkSecurityGroupNames(d *schema.Resou
return nsgNames, nil
}
func azureRMVirtualNetworkUnlockNetworkSecurityGroups(networkSecurityGroupNames *[]string) {
for _, networkSecurityGroupName := range *networkSecurityGroupNames {
armMutexKV.Unlock(networkSecurityGroupName)
}
}
func azureRMVirtualNetworkLockNetworkSecurityGroups(networkSecurityGroupNames *[]string) {
for _, networkSecurityGroupName := range *networkSecurityGroupNames {
armMutexKV.Lock(networkSecurityGroupName)
}
}