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.

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

Jump to bottom

azurerm_mssql_database: Fix error with OnlineSecondary with auditing on Primary #14192

Merged
merged 3 commits into from
Nov 16, 2021
Merged

azurerm_mssql_database: Fix error with OnlineSecondary with auditing on Primary #14192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d674c8
`azurerm_mssql_database`: Fix error with OnlineSecondary with auditin…
Nov 15, 2021
69fdb6e
Extra tests
Nov 15, 2021
457dc5c
Fix test
Nov 16, 2021
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
61 changes: 61 additions & 0 deletions internal/services/mssql/mssql_database_extended_auditing_policy_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,28 @@ func TestAccMsSqlDatabaseExtendedAuditingPolicy_basic(t *testing.T) {
})
}

func TestAccMsSqlDatabaseExtendedAuditingPolicy_primaryWithOnlineSecondary(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_mssql_database_extended_auditing_policy", "test")
r := MsSqlDatabaseExtendedAuditingPolicyResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.primaryWithOnlineSecondary(data, "test1"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("storage_account_access_key"),
{
Config: r.primaryWithOnlineSecondary(data, "test2"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("storage_account_access_key"),
})
}

func TestAccMsSqlDatabaseExtendedAuditingPolicy_requiresImport(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_mssql_database_extended_auditing_policy", "test")
r := MsSqlDatabaseExtendedAuditingPolicyResource{}
Expand Down Expand Up @@ -229,6 +251,45 @@ resource "azurerm_mssql_database_extended_auditing_policy" "test" {
`, r.template(data))
}

func (r MsSqlDatabaseExtendedAuditingPolicyResource) primaryWithOnlineSecondary(data acceptance.TestData, tag string) string {
return fmt.Sprintf(`
%[1]s

resource "azurerm_resource_group" "second" {
name = "acctestRG-mssql2-%[2]d"
location = "%[4]s"
}

resource "azurerm_mssql_server" "second" {
name = "acctest-sqlserver2-%[2]d"
resource_group_name = azurerm_resource_group.second.name
location = azurerm_resource_group.second.location
version = "12.0"
administrator_login = "mradministrator"
administrator_login_password = "thisIsDog11"
}

resource "azurerm_mssql_database" "secondary" {
name = "acctest-dbs-%[2]d"
server_id = azurerm_mssql_server.second.id
create_mode = "OnlineSecondary"
creation_source_database_id = azurerm_mssql_database.test.id

tags = {
tag = "%[5]s"
}
}

resource "azurerm_mssql_database_extended_auditing_policy" "test" {
database_id = azurerm_mssql_database.test.id
storage_endpoint = azurerm_storage_account.test.primary_blob_endpoint
storage_account_access_key = azurerm_storage_account.test.primary_access_key

depends_on = [azurerm_mssql_database.secondary]
}
`, r.template(data), data.RandomInteger, data.RandomString, data.Locations.Secondary, tag)
}

func (r MsSqlDatabaseExtendedAuditingPolicyResource) requiresImport(data acceptance.TestData) string {
return fmt.Sprintf(`
%[1]s
Expand Down
2 changes: 1 addition & 1 deletion internal/services/mssql/mssql_database_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ func resourceMsSqlDatabaseRead(d *pluginsdk.ResourceData, meta interface{}) erro
}

extendedAuditingPolicy := []interface{}{}
if createMode, ok := d.GetOk("create_mode"); !ok || createMode.(string) != "Secondary" {
if createMode, ok := d.GetOk("create_mode"); !ok || (createMode.(string) != "Secondary" && createMode.(string) != "OnlineSecondary") {
auditingResp, err := auditingClient.Get(ctx, id.ResourceGroup, id.ServerName, id.Name)
if err != nil {
return fmt.Errorf("retrieving Blob Auditing Policies for %s: %+v", id, err)
Expand Down
59 changes: 59 additions & 0 deletions internal/services/mssql/mssql_database_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,34 @@ func TestAccMsSqlDatabase_createSecondaryMode(t *testing.T) {
})
}

func TestAccMsSqlDatabase_createOnlineSecondaryMode(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_mssql_database", "secondary")
r := MsSqlDatabaseResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.createOnlineSecondaryMode(data, "test1"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("collation").HasValue("SQL_AltDiction_CP850_CI_AI"),
check.That(data.ResourceName).Key("license_type").HasValue("BasePrice"),
check.That(data.ResourceName).Key("sku_name").HasValue("GP_Gen5_2"),
),
},
data.ImportStep("sample_name", "create_mode"),
{
Config: r.createOnlineSecondaryMode(data, "test2"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("collation").HasValue("SQL_AltDiction_CP850_CI_AI"),
check.That(data.ResourceName).Key("license_type").HasValue("BasePrice"),
check.That(data.ResourceName).Key("sku_name").HasValue("GP_Gen5_2"),
),
},
data.ImportStep("sample_name", "create_mode"),
})
}

func TestAccMsSqlDatabase_scaleReplicaSet(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_mssql_database", "primary")
r := MsSqlDatabaseResource{}
Expand Down Expand Up @@ -986,6 +1014,37 @@ resource "azurerm_mssql_database" "secondary" {
`, r.complete(data), data.RandomInteger, data.Locations.Secondary, tag)
}

func (r MsSqlDatabaseResource) createOnlineSecondaryMode(data acceptance.TestData, tag string) string {
return fmt.Sprintf(`
%[1]s

resource "azurerm_resource_group" "second" {
name = "acctestRG-mssql2-%[2]d"
location = "%[3]s"
}

resource "azurerm_mssql_server" "second" {
name = "acctest-sqlserver2-%[2]d"
resource_group_name = azurerm_resource_group.second.name
location = azurerm_resource_group.second.location
version = "12.0"
administrator_login = "mradministrator"
administrator_login_password = "thisIsDog11"
}

resource "azurerm_mssql_database" "secondary" {
name = "acctest-dbs-%[2]d"
server_id = azurerm_mssql_server.second.id
create_mode = "OnlineSecondary"
creation_source_database_id = azurerm_mssql_database.test.id

tags = {
tag = "%[4]s"
}
}
`, r.complete(data), data.RandomInteger, data.Locations.Secondary, tag)
}

func (r MsSqlDatabaseResource) scaleReplicaSet(data acceptance.TestData, sku string) string {
return fmt.Sprintf(`
%[1]s
Expand Down