Skip to content
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.

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

Fix azurerm_sql_database blob auditing error under online secondary create mode #6402

Merged
merged 6 commits into from Apr 26, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions azurerm/internal/services/sql/resource_arm_sql_database.go
Expand Up @@ -364,6 +364,12 @@ func resourceArmSqlDatabaseCreateUpdate(d *schema.ResourceData, meta interface{}
resourceGroup := d.Get("resource_group_name").(string)
location := azure.NormalizeLocation(d.Get("location").(string))
createMode := d.Get("create_mode").(string)
auditingPolicies := d.Get("extended_auditing_policy").([]interface{})

if createMode == string(sql.CreateModeOnlineSecondary) && len(auditingPolicies) > 0 {
return fmt.Errorf("could not configure auditing policies on SQL Database %q (Resource Group %q, Server %q) in online secondary create mode", name, resourceGroup, serverName)
}

zoneRedundant := d.Get("zone_redundant").(bool)
t := d.Get("tags").(map[string]interface{})

Expand Down Expand Up @@ -505,12 +511,14 @@ func resourceArmSqlDatabaseCreateUpdate(d *schema.ResourceData, meta interface{}
return fmt.Errorf("Error setting database threat detection policy: %+v", err)
}

auditingClient := meta.(*clients.Client).Sql.ExtendedDatabaseBlobAuditingPoliciesClient
auditingProps := sql.ExtendedDatabaseBlobAuditingPolicy{
ExtendedDatabaseBlobAuditingPolicyProperties: helper.ExpandAzureRmSqlDBBlobAuditingPolicies(d.Get("extended_auditing_policy").([]interface{})),
}
if _, err = auditingClient.CreateOrUpdate(ctx, resourceGroup, serverName, name, auditingProps); err != nil {
return fmt.Errorf("Error issuing create/update request for SQL Database %q Blob Auditing Policies(SQL Server %q/ Resource Group %q): %+v", name, serverName, resourceGroup, err)
if createMode != string(sql.CreateModeOnlineSecondary) {
auditingClient := meta.(*clients.Client).Sql.ExtendedDatabaseBlobAuditingPoliciesClient
auditingProps := sql.ExtendedDatabaseBlobAuditingPolicy{
ExtendedDatabaseBlobAuditingPolicyProperties: helper.ExpandAzureRmSqlDBBlobAuditingPolicies(auditingPolicies),
}
if _, err = auditingClient.CreateOrUpdate(ctx, resourceGroup, serverName, name, auditingProps); err != nil {
return fmt.Errorf("Error issuing create/update request for SQL Database %q Blob Auditing Policies(SQL Server %q/ Resource Group %q): %+v", name, serverName, resourceGroup, err)
}
}

return resourceArmSqlDatabaseRead(d, meta)
Expand Down
Expand Up @@ -488,6 +488,25 @@ func TestAccAzureRMSqlDatabase_withBlobAuditingPolicesUpdate(t *testing.T) {
})
}

func TestAccAzureRMSqlDatabase_onlineSecondaryMode(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_sql_database", "test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMSqlDatabaseDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMSqlDatabase_onlineSecondaryMode(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMSqlDatabaseExists(data.ResourceName),
),
},
data.ImportStep("administrator_login_password", "create_mode"),
},
})
}

func testAccAzureRMSqlDatabase_basic(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down Expand Up @@ -1097,3 +1116,59 @@ resource "azurerm_sql_database" "test" {
}
`, data.RandomInteger, data.Locations.Primary, data.RandomIntOfLength(15))
}

func testAccAzureRMSqlDatabase_onlineSecondaryMode(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-%[1]d"
location = "%[2]s"
}

resource "azurerm_sql_server" "test" {
name = "acctestsqlserver%[1]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
version = "12.0"
administrator_login = "mradministrator"
administrator_login_password = "thisIsDog11"
}

resource "azurerm_sql_database" "test" {
name = "acctestdb%[1]d"
resource_group_name = azurerm_resource_group.test.name
server_name = azurerm_sql_server.test.name
location = azurerm_resource_group.test.location
edition = "Standard"
collation = "SQL_Latin1_General_CP1_CI_AS"
max_size_bytes = "1073741824"
requested_service_objective_name = "S0"
}

resource "azurerm_resource_group" "test2" {
name = "acctestRG2-%[1]d"
location = "%[3]s"
}

resource "azurerm_sql_server" "test2" {
name = "acctestsqlserver2%[1]d"
resource_group_name = azurerm_resource_group.test2.name
location = azurerm_resource_group.test2.location
version = "12.0"
administrator_login = "mradministrator"
administrator_login_password = "thisIsDog11"
}

resource "azurerm_sql_database" "test2" {
name = "acctestdb2%[1]d"
resource_group_name = azurerm_resource_group.test2.name
server_name = azurerm_sql_server.test2.name
location = azurerm_resource_group.test2.location
create_mode = "OnlineSecondary"
source_database_id = azurerm_sql_database.test.id
}
`, data.RandomInteger, data.Locations.Primary, data.Locations.Secondary)
}