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

Support for sql auditing to Azure Monitor #10324

Merged
merged 4 commits into from
Feb 26, 2021
Merged

Support for sql auditing to Azure Monitor #10324

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2af2b9
update
Jan 26, 2021
e9ec14e
update
Jan 27, 2021
4242df3
update
Jan 27, 2021
bce27ba
update
Feb 24, 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
42 changes: 26 additions & 16 deletions azurerm/internal/services/mssql/helper/sql_extended_auditing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ func ExtendedAuditingSchema() *schema.Schema {
Schema: map[string]*schema.Schema{
"storage_account_access_key": {
Type: schema.TypeString,
Required: true,
Optional: true,
Sensitive: true,
ValidateFunc: validation.StringIsNotEmpty,
},

"storage_endpoint": {
Type: schema.TypeString,
Required: true,
Optional: true,
ValidateFunc: validation.IsURLWithHTTPS,
},

Expand All @@ -40,6 +40,12 @@ func ExtendedAuditingSchema() *schema.Schema {
Optional: true,
ValidateFunc: validation.IntBetween(0, 3285),
},

"monitor_enabled": {
yupwei68 marked this conversation as resolved.
Show resolved Hide resolved
Type: schema.TypeBool,
Optional: true,
Default: true,
},
},
},
}
Expand All @@ -49,18 +55,15 @@ func ExpandSqlServerBlobAuditingPolicies(input []interface{}) *sql.ExtendedServe
if len(input) == 0 || input[0] == nil {
return &sql.ExtendedServerBlobAuditingPolicyProperties{
State: sql.BlobAuditingPolicyStateDisabled,

// NOTE: this works around a regression in the Azure API detailed here:
// https://github.com/Azure/azure-rest-api-specs/issues/11271
IsAzureMonitorTargetEnabled: utils.Bool(true),
}
}
serverBlobAuditingPolicies := input[0].(map[string]interface{})

ExtendedServerBlobAuditingPolicyProperties := sql.ExtendedServerBlobAuditingPolicyProperties{
State: sql.BlobAuditingPolicyStateEnabled,
StorageAccountAccessKey: utils.String(serverBlobAuditingPolicies["storage_account_access_key"].(string)),
StorageEndpoint: utils.String(serverBlobAuditingPolicies["storage_endpoint"].(string)),
State: sql.BlobAuditingPolicyStateEnabled,
StorageAccountAccessKey: utils.String(serverBlobAuditingPolicies["storage_account_access_key"].(string)),
StorageEndpoint: utils.String(serverBlobAuditingPolicies["storage_endpoint"].(string)),
IsAzureMonitorTargetEnabled: utils.Bool(serverBlobAuditingPolicies["monitor_enabled"].(bool)),
}
if v, ok := serverBlobAuditingPolicies["storage_account_access_key_is_secondary"]; ok {
ExtendedServerBlobAuditingPolicyProperties.IsStorageSecondaryKeyInUse = utils.Bool(v.(bool))
Expand Down Expand Up @@ -93,13 +96,18 @@ func FlattenSqlServerBlobAuditingPolicies(extendedServerBlobAuditingPolicy *sql.
if extendedServerBlobAuditingPolicy.RetentionDays != nil {
retentionDays = *extendedServerBlobAuditingPolicy.RetentionDays
}
var monitor bool
if extendedServerBlobAuditingPolicy.IsAzureMonitorTargetEnabled != nil {
monitor = *extendedServerBlobAuditingPolicy.IsAzureMonitorTargetEnabled
}

return []interface{}{
map[string]interface{}{
"storage_account_access_key": storageAccessKey,
"storage_endpoint": storageEndpoint,
"storage_account_access_key_is_secondary": secondKeyInUse,
"retention_in_days": retentionDays,
"monitor_enabled": monitor,
},
}
}
Expand All @@ -108,18 +116,15 @@ func ExpandMsSqlDBBlobAuditingPolicies(input []interface{}) *sql.ExtendedDatabas
if len(input) == 0 || input[0] == nil {
return &sql.ExtendedDatabaseBlobAuditingPolicyProperties{
State: sql.BlobAuditingPolicyStateDisabled,

// NOTE: this works around a regression in the Azure API detailed here:
// https://github.com/Azure/azure-rest-api-specs/issues/11271
IsAzureMonitorTargetEnabled: utils.Bool(true),
}
}
dbBlobAuditingPolicies := input[0].(map[string]interface{})

ExtendedDatabaseBlobAuditingPolicyProperties := sql.ExtendedDatabaseBlobAuditingPolicyProperties{
State: sql.BlobAuditingPolicyStateEnabled,
StorageAccountAccessKey: utils.String(dbBlobAuditingPolicies["storage_account_access_key"].(string)),
StorageEndpoint: utils.String(dbBlobAuditingPolicies["storage_endpoint"].(string)),
State: sql.BlobAuditingPolicyStateEnabled,
StorageAccountAccessKey: utils.String(dbBlobAuditingPolicies["storage_account_access_key"].(string)),
StorageEndpoint: utils.String(dbBlobAuditingPolicies["storage_endpoint"].(string)),
IsAzureMonitorTargetEnabled: utils.Bool(dbBlobAuditingPolicies["monitor_enabled"].(bool)),
}
if v, ok := dbBlobAuditingPolicies["storage_account_access_key_is_secondary"]; ok {
ExtendedDatabaseBlobAuditingPolicyProperties.IsStorageSecondaryKeyInUse = utils.Bool(v.(bool))
Expand Down Expand Up @@ -152,13 +157,18 @@ func FlattenMsSqlDBBlobAuditingPolicies(extendedDatabaseBlobAuditingPolicy *sql.
if extendedDatabaseBlobAuditingPolicy.RetentionDays != nil {
retentionDays = *extendedDatabaseBlobAuditingPolicy.RetentionDays
}
var monitor bool
if extendedDatabaseBlobAuditingPolicy.IsAzureMonitorTargetEnabled != nil {
monitor = *extendedDatabaseBlobAuditingPolicy.IsAzureMonitorTargetEnabled
}

return []interface{}{
map[string]interface{}{
"storage_account_access_key": storageAccessKey,
"storage_endpoint": storageEndpoint,
"storage_account_access_key_is_secondary": secondKeyInUse,
"retention_in_days": retentionDays,
"monitor_enabled": monitor,
},
}
}
26 changes: 13 additions & 13 deletions azurerm/internal/services/mssql/mssql_database_extended_auditing_policy_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func resourceMsSqlDatabaseExtendedAuditingPolicy() *schema.Resource {

"storage_endpoint": {
Type: schema.TypeString,
Required: true,
Optional: true,
ValidateFunc: validation.IsURLWithHTTPS,
},

Expand All @@ -70,6 +70,12 @@ func resourceMsSqlDatabaseExtendedAuditingPolicy() *schema.Resource {
Default: 0,
ValidateFunc: validation.IntBetween(0, 3285),
},

"monitor_enabled": {
Type: schema.TypeBool,
Optional: true,
Default: true,
},
},
}
}
Expand Down Expand Up @@ -102,14 +108,11 @@ func resourceMsSqlDatabaseExtendedAuditingPolicyCreateUpdate(d *schema.ResourceD

params := sql.ExtendedDatabaseBlobAuditingPolicy{
ExtendedDatabaseBlobAuditingPolicyProperties: &sql.ExtendedDatabaseBlobAuditingPolicyProperties{
State: sql.BlobAuditingPolicyStateEnabled,
StorageEndpoint: utils.String(d.Get("storage_endpoint").(string)),
IsStorageSecondaryKeyInUse: utils.Bool(d.Get("storage_account_access_key_is_secondary").(bool)),
RetentionDays: utils.Int32(int32(d.Get("retention_in_days").(int))),

// NOTE: this works around a regression in the Azure API detailed here:
// https://github.com/Azure/azure-rest-api-specs/issues/11271
IsAzureMonitorTargetEnabled: utils.Bool(true),
State: sql.BlobAuditingPolicyStateEnabled,
StorageEndpoint: utils.String(d.Get("storage_endpoint").(string)),
IsStorageSecondaryKeyInUse: utils.Bool(d.Get("storage_account_access_key_is_secondary").(bool)),
RetentionDays: utils.Int32(int32(d.Get("retention_in_days").(int))),
IsAzureMonitorTargetEnabled: utils.Bool(d.Get("monitor_enabled").(bool)),
},
}

Expand Down Expand Up @@ -166,6 +169,7 @@ func resourceMsSqlDatabaseExtendedAuditingPolicyRead(d *schema.ResourceData, met
d.Set("storage_endpoint", props.StorageEndpoint)
d.Set("storage_account_access_key_is_secondary", props.IsStorageSecondaryKeyInUse)
d.Set("retention_in_days", props.RetentionDays)
d.Set("monitor_enabled", props.IsAzureMonitorTargetEnabled)
}

return nil
Expand All @@ -184,10 +188,6 @@ func resourceMsSqlDatabaseExtendedAuditingPolicyDelete(d *schema.ResourceData, m
params := sql.ExtendedDatabaseBlobAuditingPolicy{
ExtendedDatabaseBlobAuditingPolicyProperties: &sql.ExtendedDatabaseBlobAuditingPolicyProperties{
State: sql.BlobAuditingPolicyStateDisabled,

// NOTE: this works around a regression in the Azure API detailed here:
// https://github.com/Azure/azure-rest-api-specs/issues/11271
IsAzureMonitorTargetEnabled: utils.Bool(true),
},
}

Expand Down
Loading