diff --git a/pkg/merger/merger_test.go b/pkg/merger/merger_test.go index 879c536..36549b2 100644 --- a/pkg/merger/merger_test.go +++ b/pkg/merger/merger_test.go @@ -96,7 +96,7 @@ func TestMergeConfigFiles(t *testing.T) { EnablePullRequestReviews: models.Bool(true), EnableIssueDashboards: models.Bool(true), SeverityThreshold: models.SeverityHigh, - PriorityThreshold: models.PriorityMedium, + PriorityThreshold: models.PriorityImportant, IgnoreDirs: []string{"dir1", "dir2"}, IgnorePaths: []string{"path1", "path2"}, Code: models.Code{ @@ -235,7 +235,7 @@ func TestMergeConfigFiles(t *testing.T) { EnablePullRequestReviews: models.Bool(true), EnableIssueDashboards: models.Bool(true), SeverityThreshold: models.SeverityHigh, - PriorityThreshold: models.PriorityMedium, + PriorityThreshold: models.PriorityImportant, IgnoreDirs: []string{"dir1", "dir2"}, IgnorePaths: []string{"path1", "path2"}, Code: models.Code{ diff --git a/pkg/models/priority.go b/pkg/models/priority.go index 0ea8f47..86af5a4 100644 --- a/pkg/models/priority.go +++ b/pkg/models/priority.go @@ -1,9 +1,7 @@ package models const ( - PriorityUrgent string = "URGENT" - PriorityImportant string = "IMPORTANT" - PriorityMedium string = "MEDIUM" - PriorityLow string = "LOW" - PriorityNegligible string = "NEGLIGIBLE" + PriorityUrgent string = "URGENT" + PriorityImportant string = "IMPORTANT" + PriorityInformational string = "INFORMATIONAL" ) diff --git a/pkg/parser/defaults.go b/pkg/parser/defaults.go index eb243b1..2699251 100644 --- a/pkg/parser/defaults.go +++ b/pkg/parser/defaults.go @@ -3,7 +3,7 @@ package parser import "github.com/nullify-platform/config-file-parser/pkg/models" const DefaultSeverityThreshold = models.SeverityMedium -const DefaultPriorityThreshold = models.PriorityMedium +const DefaultPriorityThreshold = models.PriorityImportant func NewDefaultConfig() *models.Configuration { return &models.Configuration{ diff --git a/pkg/parser/parse.go b/pkg/parser/parse.go index 29a7b58..354544b 100644 --- a/pkg/parser/parse.go +++ b/pkg/parser/parse.go @@ -25,6 +25,11 @@ func sanitizeConfig(config *models.Configuration) { config.SeverityThreshold = strings.ToUpper(config.SeverityThreshold) } + config.PriorityThreshold = strings.Trim(config.PriorityThreshold, " ") + if config.PriorityThreshold != "" { + config.PriorityThreshold = strings.ToUpper(config.PriorityThreshold) + } + for name, n := range config.Notifications { if n.Events.All != nil { n.Events.All.MinimumSeverity = strings.ToUpper(n.Events.All.MinimumSeverity) diff --git a/pkg/validator/severity.go b/pkg/validator/severity.go index 042378f..23b3352 100644 --- a/pkg/validator/severity.go +++ b/pkg/validator/severity.go @@ -28,9 +28,7 @@ var validPriorities = []string{ "", models.PriorityUrgent, models.PriorityImportant, - models.PriorityMedium, - models.PriorityLow, - models.PriorityNegligible, + models.PriorityInformational, } // ValidatePriorityThreshold returns true if the priority_threshold diff --git a/tests/integration_test.go b/tests/integration_test.go index 69bb701..ef350cc 100644 --- a/tests/integration_test.go +++ b/tests/integration_test.go @@ -15,6 +15,7 @@ func TestIntegration(t *testing.T) { EnablePullRequestReviews: models.Bool(true), EnableIssueDashboards: models.Bool(true), SeverityThreshold: models.SeverityMedium, + PriorityThreshold: models.PriorityUrgent, IgnoreDirs: []string{"dir1"}, IgnorePaths: []string{"data/**/*"}, Secrets: models.Secrets{ diff --git a/tests/nullify.yaml b/tests/nullify.yaml index 8d4a48c..f5301d5 100644 --- a/tests/nullify.yaml +++ b/tests/nullify.yaml @@ -2,6 +2,7 @@ enable_fail_builds: true enable_pull_request_reviews: true enable_issue_dashboards: true severity_threshold: medium +priority_threshold: urgent ignore_dirs: - dir1 ignore_paths: