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

sentinel - fix tests for 4.0 #26952

Closed
wants to merge 1 commit into from
+37 −9
Closed

sentinel - fix tests for 4.0 #26952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions internal/services/sentinel/sentinel_alert_rule_fusion_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestAccSentinelAlertRuleFusion_basic(t *testing.T) {
})
}

func TestAccSentinelAlertRuleFusion_disable(t *testing.T) {
func TestAccSentinelAlertRuleFusion_enable(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_sentinel_alert_rule_fusion", "test")
r := SentinelAlertRuleFusionResource{}

Expand All @@ -47,7 +47,7 @@ func TestAccSentinelAlertRuleFusion_disable(t *testing.T) {
},
data.ImportStep(),
{
Config: r.disabled(data),
Config: r.enabled(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
Expand Down Expand Up @@ -134,30 +134,35 @@ func (r SentinelAlertRuleFusionResource) basic(data acceptance.TestData) string
data "azurerm_sentinel_alert_rule_template" "test" {
display_name = "Advanced Multistage Attack Detection"
log_analytics_workspace_id = azurerm_log_analytics_solution.test.workspace_resource_id

depends_on = [azurerm_sentinel_log_analytics_workspace_onboarding.test]
}

resource "azurerm_sentinel_alert_rule_fusion" "test" {
name = "acctest-SentinelAlertRule-Fusion-%d"
log_analytics_workspace_id = azurerm_log_analytics_solution.test.workspace_resource_id
alert_rule_template_guid = data.azurerm_sentinel_alert_rule_template.test.name
enabled = false
}
`, r.template(data), data.RandomInteger)
}

func (r SentinelAlertRuleFusionResource) disabled(data acceptance.TestData) string {
func (r SentinelAlertRuleFusionResource) enabled(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

data "azurerm_sentinel_alert_rule_template" "test" {
display_name = "Advanced Multistage Attack Detection"
log_analytics_workspace_id = azurerm_log_analytics_solution.test.workspace_resource_id

depends_on = [azurerm_sentinel_log_analytics_workspace_onboarding.test]
}

resource "azurerm_sentinel_alert_rule_fusion" "test" {
name = "acctest-SentinelAlertRule-Fusion-%d"
log_analytics_workspace_id = azurerm_log_analytics_solution.test.workspace_resource_id
alert_rule_template_guid = data.azurerm_sentinel_alert_rule_template.test.name
enabled = false
enabled = true
}
`, r.template(data), data.RandomInteger)
}
Expand All @@ -169,6 +174,8 @@ func (r SentinelAlertRuleFusionResource) sourceSetting(data acceptance.TestData,
data "azurerm_sentinel_alert_rule_template" "test" {
display_name = "Advanced Multistage Attack Detection"
log_analytics_workspace_id = azurerm_log_analytics_solution.test.workspace_resource_id

depends_on = [azurerm_sentinel_log_analytics_workspace_onboarding.test]
}

resource "azurerm_sentinel_alert_rule_fusion" "test" {
Expand Down Expand Up @@ -245,6 +252,7 @@ resource "azurerm_sentinel_alert_rule_fusion" "import" {
name = azurerm_sentinel_alert_rule_fusion.test.name
log_analytics_workspace_id = azurerm_sentinel_alert_rule_fusion.test.log_analytics_workspace_id
alert_rule_template_guid = azurerm_sentinel_alert_rule_fusion.test.alert_rule_template_guid
enabled = azurerm_sentinel_alert_rule_fusion.test.enabled
}
`, r.basic(data))
}
Expand Down Expand Up @@ -279,5 +287,9 @@ resource "azurerm_log_analytics_solution" "test" {
product = "OMSGallery/SecurityInsights"
}
}

resource "azurerm_sentinel_log_analytics_workspace_onboarding" "test" {
workspace_id = azurerm_log_analytics_workspace.test.id
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
}
18 changes: 18 additions & 0 deletions internal/services/sentinel/sentinel_alert_rule_nrt_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ AzureActivity |
where ActivityStatus == "Succeeded" |
make-series dcount(ResourceId) default=0 on EventSubmissionTimestamp in range(ago(7d), now(), 1d) by Caller
QUERY

event_grouping {
aggregation_method = "SingleAlert"
}
}
`, r.template(data), data.RandomInteger)
}
Expand Down Expand Up @@ -231,6 +235,9 @@ resource "azurerm_sentinel_alert_rule_nrt" "test" {
OperatingSystemType = "OSType"
}

event_grouping {
aggregation_method = "SingleAlert"
}
}
`, r.template(data), data.RandomInteger)
}
Expand All @@ -250,6 +257,9 @@ resource "azurerm_sentinel_alert_rule_nrt" "test" {
OperatingSystemType = "OSType"
}

event_grouping {
aggregation_method = "SingleAlert"
}
}
`, r.template(data), data.RandomInteger)
}
Expand All @@ -264,6 +274,10 @@ resource "azurerm_sentinel_alert_rule_nrt" "import" {
display_name = azurerm_sentinel_alert_rule_nrt.test.display_name
severity = azurerm_sentinel_alert_rule_nrt.test.severity
query = azurerm_sentinel_alert_rule_nrt.test.query

event_grouping {
aggregation_method = "azurerm_sentinel_alert_rule_nrt.test.event_grouping.0.aggregation_method"
}
}
`, r.basic(data))
}
Expand All @@ -284,6 +298,10 @@ resource "azurerm_sentinel_alert_rule_nrt" "test" {
severity = "Low"
alert_rule_template_guid = data.azurerm_sentinel_alert_rule_template.test.name
query = "Heartbeat"

event_grouping {
aggregation_method = "SingleAlert"
}
}
`, r.template(data), data.RandomInteger)
}
Expand Down
4 changes: 2 additions & 2 deletions internal/services/sentinel/sentinel_alert_rule_template_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,14 @@ func dataSourceSentinelAlertRuleTemplateRead(d *pluginsdk.ResourceData, meta int
nameToLog = name
resp, err = getAlertRuleTemplateByName(ctx, client, workspaceID, name)
if err != nil {
return fmt.Errorf("an Alert Rule Template named %q was not found", name)
return fmt.Errorf("finding Alert Rule Template named %q: %+v", name, err)
}
} else {
nameToLog = displayName
var realName *string
resp, realName, err = getAlertRuleTemplateByDisplayName(ctx, client, workspaceID, displayName)
if err != nil {
return fmt.Errorf("an Alert Rule Template with the Display Name %q was not found", displayName)
return fmt.Errorf("finding Alert Rule Template with the Display Name %q: %+v", displayName, err)
}
name = *realName
}
Expand Down
1 change: 0 additions & 1 deletion internal/services/sentinel/sentinel_automation_rule_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ func resourceSentinelAutomationRuleCreateOrUpdate(d *pluginsdk.ResourceData, met
IsEnabled: d.Get("enabled").(bool),
TriggersOn: automationrules.TriggersOn(d.Get("triggers_on").(string)),
TriggersWhen: automationrules.TriggersWhen(d.Get("triggers_when").(string)),
Conditions: expandAutomationRuleConditions(d.Get("condition").([]interface{})),
},
Actions: actions,
},
Expand Down
3 changes: 1 addition & 2 deletions internal/services/sentinel/sentinel_threat_intelligence_indicator_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@ resource "azurerm_log_analytics_workspace" "test" {
}
resource "azurerm_sentinel_log_analytics_workspace_onboarding" "test" {
resource_group_name = azurerm_resource_group.test.name
workspace_name = azurerm_log_analytics_workspace.test.name
workspace_id = azurerm_log_analytics_workspace.test.id
}
`, data.RandomInteger, data.Locations.Primary)
}
Expand Down
Loading