Skip to content

Commit 2c142be

Browse files
fix: conditions_v2, filters_v2, actions_v2 import
1 parent d711353 commit 2c142be

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

internal/provider/model_issue_alert.go

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,16 +1430,18 @@ func (m *IssueAlertModel) Fill(ctx context.Context, alert apiclient.ProjectRule)
14301430
diags.AddError("Invalid conditions", err.Error())
14311431
return
14321432
}
1433-
} else if m.ConditionsV2 != nil {
1434-
m.ConditionsV2 = ptr.Ptr(sliceutils.Map(func(condition apiclient.ProjectRuleCondition) IssueAlertConditionModel {
1433+
} else {
1434+
conditionsModels := sliceutils.Map(func(condition apiclient.ProjectRuleCondition) IssueAlertConditionModel {
14351435
var conditionModel IssueAlertConditionModel
14361436
diags.Append(conditionModel.Fill(ctx, condition)...)
14371437
return conditionModel
1438-
}, alert.Conditions))
1438+
}, alert.Conditions)
14391439

14401440
if diags.HasError() {
14411441
return
14421442
}
1443+
1444+
m.ConditionsV2 = ptr.Ptr(conditionsModels)
14431445
}
14441446

14451447
if !m.Filters.IsNull() {
@@ -1448,16 +1450,18 @@ func (m *IssueAlertModel) Fill(ctx context.Context, alert apiclient.ProjectRule)
14481450
} else {
14491451
diags.AddError("Invalid filters", err.Error())
14501452
}
1451-
} else if m.FiltersV2 != nil {
1452-
m.FiltersV2 = ptr.Ptr(sliceutils.Map(func(filter apiclient.ProjectRuleFilter) IssueAlertFilterModel {
1453+
} else {
1454+
filterModels := sliceutils.Map(func(filter apiclient.ProjectRuleFilter) IssueAlertFilterModel {
14531455
var filterModel IssueAlertFilterModel
14541456
diags.Append(filterModel.Fill(ctx, filter)...)
14551457
return filterModel
1456-
}, alert.Filters))
1458+
}, alert.Filters)
14571459

14581460
if diags.HasError() {
14591461
return
14601462
}
1463+
1464+
m.FiltersV2 = ptr.Ptr(filterModels)
14611465
}
14621466

14631467
if !m.Actions.IsNull() {
@@ -1466,16 +1470,18 @@ func (m *IssueAlertModel) Fill(ctx context.Context, alert apiclient.ProjectRule)
14661470
} else {
14671471
diags.AddError("Invalid actions", err.Error())
14681472
}
1469-
} else if m.ActionsV2 != nil {
1470-
m.ActionsV2 = ptr.Ptr(sliceutils.Map(func(action apiclient.ProjectRuleAction) IssueAlertActionModel {
1473+
} else {
1474+
actionModels := sliceutils.Map(func(action apiclient.ProjectRuleAction) IssueAlertActionModel {
14711475
var actionModel IssueAlertActionModel
14721476
diags.Append(actionModel.Fill(ctx, action)...)
14731477
return actionModel
1474-
}, alert.Actions))
1478+
}, alert.Actions)
14751479

14761480
if diags.HasError() {
14771481
return
14781482
}
1483+
1484+
m.ActionsV2 = ptr.Ptr(actionModels)
14791485
}
14801486

14811487
return

0 commit comments

Comments
 (0)