From a52c4bce6689b5b5255fbd1ea905cd525169e3c0 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Thu, 7 Jan 2016 11:00:57 -0800 Subject: [PATCH] provider/azure: Don't delete firewall rules on non-existent servers --- .../azure/resource_azure_sql_database_server_firewall_rule.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/providers/azure/resource_azure_sql_database_server_firewall_rule.go b/builtin/providers/azure/resource_azure_sql_database_server_firewall_rule.go index a5cb0b214..06df80ce1 100644 --- a/builtin/providers/azure/resource_azure_sql_database_server_firewall_rule.go +++ b/builtin/providers/azure/resource_azure_sql_database_server_firewall_rule.go @@ -209,6 +209,9 @@ func resourceAzureSqlDatabaseServerFirewallRuleDelete(d *schema.ResourceData, me // go ahead and delete the rule: log.Printf("[INFO] Issuing deletion of Azure Database Server Firewall Rule %q in Server %q.", name, serverName) if err := sqlClient.DeleteFirewallRule(serverName, name); err != nil { + if strings.Contains(err.Error(), "Cannot open server") { + break + } return fmt.Errorf("Error deleting Azure Database Server Firewall Rule %q for Server %q: %s", name, serverName, err) }