Skip to content

Commit f0ce107

Browse files
committed
provider/azure: Fix up destroy checks
1 parent 9346355 commit f0ce107

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

builtin/providers/azure/resource_azure_sql_database_server_firewall_rule_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package azure
22

33
import (
44
"fmt"
5+
"strings"
56
"testing"
67

78
"github.com/hashicorp/terraform/helper/resource"
@@ -149,6 +150,10 @@ func testAccAzureDatabaseServerFirewallRuleDeleted(servers []string) resource.Te
149150
for _, server := range servers {
150151
rules, err := sqlClient.ListFirewallRules(server)
151152
if err != nil {
153+
// ¯\_(ツ)_/¯
154+
if strings.Contains(err.Error(), "Cannot open server") {
155+
return nil
156+
}
152157
return fmt.Errorf("Error listing Azure Database Server Firewall Rules for Server %q: %s", server, err)
153158
}
154159

builtin/providers/azure/resource_azure_sql_database_service_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package azure
22

33
import (
44
"fmt"
5+
"strings"
56
"testing"
67

78
"github.com/hashicorp/terraform/helper/resource"
@@ -146,6 +147,10 @@ func testAccCheckAzureSqlDatabaseServiceDeleted(s *terraform.State) error {
146147
sqlClient := testAccProvider.Meta().(*Client).sqlClient
147148
dbs, err := sqlClient.ListDatabases(*testAccAzureSqlServerName)
148149
if err != nil {
150+
// ¯\_(ツ)_/¯
151+
if strings.Contains(err.Error(), "Cannot open server") {
152+
return nil
153+
}
149154
return fmt.Errorf("Error issuing Azure SQL Service list request: %s", err)
150155
}
151156

0 commit comments

Comments
 (0)