Skip to content

fix: conditions_v2, filters_v2, actions_v2 import #712

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: conditions_v2, filters_v2, actions_v2 import #712

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
24 changes: 15 additions & 9 deletions internal/provider/model_issue_alert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,16 +1430,18 @@ func (m *IssueAlertModel) Fill(ctx context.Context, alert apiclient.ProjectRule)
diags.AddError("Invalid conditions", err.Error())
return
}
} else if m.ConditionsV2 != nil {
m.ConditionsV2 = ptr.Ptr(sliceutils.Map(func(condition apiclient.ProjectRuleCondition) IssueAlertConditionModel {
} else {
conditionsModels := sliceutils.Map(func(condition apiclient.ProjectRuleCondition) IssueAlertConditionModel {
var conditionModel IssueAlertConditionModel
diags.Append(conditionModel.Fill(ctx, condition)...)
return conditionModel
}, alert.Conditions))
}, alert.Conditions)

if diags.HasError() {
return
}

m.ConditionsV2 = ptr.Ptr(conditionsModels)
}

if !m.Filters.IsNull() {
Expand All @@ -1448,16 +1450,18 @@ func (m *IssueAlertModel) Fill(ctx context.Context, alert apiclient.ProjectRule)
} else {
diags.AddError("Invalid filters", err.Error())
}
} else if m.FiltersV2 != nil {
m.FiltersV2 = ptr.Ptr(sliceutils.Map(func(filter apiclient.ProjectRuleFilter) IssueAlertFilterModel {
} else {
filterModels := sliceutils.Map(func(filter apiclient.ProjectRuleFilter) IssueAlertFilterModel {
var filterModel IssueAlertFilterModel
diags.Append(filterModel.Fill(ctx, filter)...)
return filterModel
}, alert.Filters))
}, alert.Filters)

if diags.HasError() {
return
}

m.FiltersV2 = ptr.Ptr(filterModels)
}

if !m.Actions.IsNull() {
Expand All @@ -1466,16 +1470,18 @@ func (m *IssueAlertModel) Fill(ctx context.Context, alert apiclient.ProjectRule)
} else {
diags.AddError("Invalid actions", err.Error())
}
} else if m.ActionsV2 != nil {
m.ActionsV2 = ptr.Ptr(sliceutils.Map(func(action apiclient.ProjectRuleAction) IssueAlertActionModel {
} else {
actionModels := sliceutils.Map(func(action apiclient.ProjectRuleAction) IssueAlertActionModel {
var actionModel IssueAlertActionModel
diags.Append(actionModel.Fill(ctx, action)...)
return actionModel
}, alert.Actions))
}, alert.Actions)

if diags.HasError() {
return
}

m.ActionsV2 = ptr.Ptr(actionModels)
}

return
Expand Down