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

azurerm_mssql_database: Fix extended_auditing_policy for Secondaries #13799

Merged
merged 3 commits into from
Oct 21, 2021
Merged

azurerm_mssql_database: Fix extended_auditing_policy for Secondaries #13799

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee29d2d
`azurerm_mssql_database`: Fix for `extended_auditing_policy` for impo…
Oct 19, 2021
89a4105
Fix and extend AccTest
Oct 20, 2021
1fad7cc
terrafmt
Oct 20, 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
16 changes: 9 additions & 7 deletions internal/services/mssql/mssql_database_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,13 +705,15 @@ func resourceMsSqlDatabaseRead(d *pluginsdk.ResourceData, meta interface{}) erro
}
}

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)
}
if createMode, ok := d.GetOk("create_mode"); !ok || createMode.(string) != "Secondary" {
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)
}

if err := d.Set("extended_auditing_policy", helper.FlattenMsSqlDBBlobAuditingPolicies(&auditingResp, d)); err != nil {
return fmt.Errorf("setting `extended_auditing_policy`: %+v", err)
if err := d.Set("extended_auditing_policy", helper.FlattenMsSqlDBBlobAuditingPolicies(&auditingResp, d)); err != nil {
return fmt.Errorf("setting `extended_auditing_policy`: %+v", err)
}
}

geoBackupPolicy := true
Expand Down Expand Up @@ -746,7 +748,7 @@ func resourceMsSqlDatabaseRead(d *pluginsdk.ResourceData, meta interface{}) erro
d.SetId("")
return nil
}
return fmt.Errorf("retrieving Geo Backuip Policies for %s: %+v", id, err)
return fmt.Errorf("retrieving Geo Backup Policies for %s: %+v", id, err)
}

// For Datawarehouse SKUs, set the geo-backup policy setting
Expand Down