Skip to content

provider: ensure all locks are done in the same order #4527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
katbyte merged 2 commits into from
Oct 10, 2019
Merged

provider: ensure all locks are done in the same order #4527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d82d9aa
provider: ensure all locks are done in the same order
katbyte Oct 5, 2019
4c9a7ee
make whitespace
katbyte Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions azurerm/resource_arm_firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ func resourceArmFirewallCreateUpdate(d *schema.ResourceData, meta interface{}) e
locks.ByName(name, azureFirewallResourceName)
defer locks.UnlockByName(name, azureFirewallResourceName)

locks.MultipleByName(subnetToLock, subnetResourceName)
defer locks.UnlockMultipleByName(subnetToLock, subnetResourceName)

locks.MultipleByName(vnetToLock, virtualNetworkResourceName)
defer locks.UnlockMultipleByName(vnetToLock, virtualNetworkResourceName)

locks.MultipleByName(subnetToLock, subnetResourceName)
defer locks.UnlockMultipleByName(subnetToLock, subnetResourceName)

parameters := network.AzureFirewall{
Location: &location,
Tags: tags.Expand(t),
Expand Down Expand Up @@ -261,12 +261,12 @@ func resourceArmFirewallDelete(d *schema.ResourceData, meta interface{}) error {
locks.ByName(name, azureFirewallResourceName)
defer locks.UnlockByName(name, azureFirewallResourceName)

locks.MultipleByName(&subnetNamesToLock, subnetResourceName)
defer locks.UnlockMultipleByName(&subnetNamesToLock, subnetResourceName)

locks.MultipleByName(&virtualNetworkNamesToLock, virtualNetworkResourceName)
defer locks.UnlockMultipleByName(&virtualNetworkNamesToLock, virtualNetworkResourceName)

locks.MultipleByName(&subnetNamesToLock, subnetResourceName)
defer locks.UnlockMultipleByName(&subnetNamesToLock, subnetResourceName)

future, err := client.Delete(ctx, resourceGroup, name)
if err != nil {
return fmt.Errorf("Error deleting Azure Firewall %q (Resource Group %q): %+v", name, resourceGroup, err)
Expand Down
12 changes: 6 additions & 6 deletions azurerm/resource_arm_network_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ func resourceArmNetworkProfileCreateUpdate(d *schema.ResourceData, meta interfac
locks.ByName(name, azureNetworkProfileResourceName)
defer locks.UnlockByName(name, azureNetworkProfileResourceName)

locks.MultipleByName(subnetsToLock, subnetResourceName)
defer locks.UnlockMultipleByName(subnetsToLock, subnetResourceName)

locks.MultipleByName(vnetsToLock, virtualNetworkResourceName)
defer locks.UnlockMultipleByName(vnetsToLock, virtualNetworkResourceName)

locks.MultipleByName(subnetsToLock, subnetResourceName)
defer locks.UnlockMultipleByName(subnetsToLock, subnetResourceName)

parameters := network.Profile{
Location: &location,
Tags: tags.Expand(t),
Expand Down Expand Up @@ -228,12 +228,12 @@ func resourceArmNetworkProfileDelete(d *schema.ResourceData, meta interface{}) e
locks.ByName(name, azureNetworkProfileResourceName)
defer locks.UnlockByName(name, azureNetworkProfileResourceName)

locks.MultipleByName(subnetsToLock, subnetResourceName)
defer locks.UnlockMultipleByName(subnetsToLock, subnetResourceName)

locks.MultipleByName(vnetsToLock, virtualNetworkResourceName)
defer locks.UnlockMultipleByName(vnetsToLock, virtualNetworkResourceName)

locks.MultipleByName(subnetsToLock, subnetResourceName)
defer locks.UnlockMultipleByName(subnetsToLock, subnetResourceName)

if _, err = client.Delete(ctx, resourceGroup, name); err != nil {
return fmt.Errorf("Error deleting Network Profile %q (Resource Group %q): %+v", name, resourceGroup, err)
}
Expand Down
13 changes: 9 additions & 4 deletions azurerm/resource_arm_redis_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,13 @@ func resourceArmRedisCacheCreate(d *schema.ResourceData, meta interface{}) error
}
subnetName := parsed.Path["subnets"]
virtualNetworkName := parsed.Path["virtualNetworks"]
locks.ByName(subnetName, subnetResourceName)
defer locks.UnlockByName(subnetName, subnetResourceName)

locks.ByName(virtualNetworkName, virtualNetworkResourceName)
defer locks.UnlockByName(virtualNetworkName, virtualNetworkResourceName)

locks.ByName(subnetName, subnetResourceName)
defer locks.UnlockByName(subnetName, subnetResourceName)

parameters.SubnetID = utils.String(v.(string))
}

Expand Down Expand Up @@ -575,10 +578,12 @@ func resourceArmRedisCacheDelete(d *schema.ResourceData, meta interface{}) error
}
subnetName := parsed.Path["subnets"]
virtualNetworkName := parsed.Path["virtualNetworks"]
locks.ByName(subnetName, subnetResourceName)
defer locks.UnlockByName(subnetName, subnetResourceName)

locks.ByName(virtualNetworkName, virtualNetworkResourceName)
defer locks.UnlockByName(virtualNetworkName, virtualNetworkResourceName)

locks.ByName(subnetName, subnetResourceName)
defer locks.UnlockByName(subnetName, subnetResourceName)
}
future, err := client.Delete(ctx, resGroup, name)
if err != nil {
Expand Down