Skip to content

Commit 91b361d

Browse files
committed
Addressing PR comments.
1 parent d2f6165 commit 91b361d

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

internal/clients/kibana/alerting.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ func ruleResponseToModel(spaceID string, res *alerting.RuleResponseProperties) *
2727
Params: action.Params,
2828
}
2929

30-
if alerting.IsNil(action.Frequency) {
31-
a.Frequency = nil
32-
} else {
30+
if !alerting.IsNil(action.Frequency) {
3331
frequency := unwrapOptionalField(action.Frequency)
3432

3533
a.Frequency = &models.AlertingRuleActionFrequency{
@@ -89,9 +87,7 @@ func ruleActionsToActionsInner(ruleActions []models.AlertingRuleAction) []alerti
8987
Params: action.Params,
9088
}
9189

92-
if alerting.IsNil(action.Frequency) {
93-
actionToAppend.Frequency = nil
94-
} else {
90+
if !alerting.IsNil(action.Frequency) {
9591
frequency := alerting.ActionsInnerFrequency{
9692
Summary: action.Frequency.Summary,
9793
NotifyWhen: (alerting.NotifyWhen)(action.Frequency.NotifyWhen),

internal/kibana/alerting.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
)
1818

1919
var alertDelayMinSupportedVersion = version.Must(version.NewVersion("8.13.0"))
20+
var frequencyMinSupportedVersion = version.Must(version.NewVersion("8.6.0"))
2021

2122
func ResourceAlertingRule() *schema.Resource {
2223
apikeySchema := map[string]*schema.Schema{
@@ -272,14 +273,8 @@ func getActionsFromResourceData(d *schema.ResourceData, serverVersion *version.V
272273
currentAction := fmt.Sprintf("actions.%d", i)
273274

274275
if _, ok := d.GetOk(currentAction + ".frequency"); ok {
275-
if serverVersion.LessThan(alertDelayMinSupportedVersion) {
276-
return []models.AlertingRuleAction{}, diag.Diagnostics{
277-
diag.Diagnostic{
278-
Severity: diag.Error,
279-
Summary: "actions.frequency is only supported for Elasticsearch v8.13 or higher",
280-
Detail: "actions.frequency is only supported for Elasticsearch v8.13 or higher",
281-
},
282-
}
276+
if serverVersion.LessThan(frequencyMinSupportedVersion) {
277+
return []models.AlertingRuleAction{}, diag.Errorf("actions.frequency is only supported for Elasticsearch v8.6 or higher")
283278
}
284279

285280
frequency := models.AlertingRuleActionFrequency{

0 commit comments

Comments
 (0)