wip

Author: tim-thacker-nullify

examples/nullify.yaml

@@ -6,47 +6,6 @@ ignore_dirs:
   - dir1
 ignore_paths:
   - data/**/*
-notifications:
-  all-events-webhook:
-    events:
-      all:
-        minimum_severity: high
-        secret_types: [ ssh_key ]
-    targets:
-      webhook:
-        urls: [ https://webhook.site/123456 ]
-  findings-to-slack-and-email:
-    events:
-      new_code_findings:
-        minimum_severity: high
-      new_secret_findings:
-        types: [ ssh_key ]
-      new_dependency_findings:
-        minimum_severity: high
-    targets:
-      slack:
-        channels: [ "123456" ]
-      email:
-        addresses: [ [email protected], [email protected] ]
-    repositories:
-      - config-file-parser
-      - dast-action
-      - cli
-scheduled_notifications:
-  new-findings:
-    schedule: "0 0 * * *"
-    timezone: "America/Los_Angeles"
-    topics:
-      all: true
-    targets:
-      slack:
-        channels: [ "123456" ]
-      email:
-        addresses: [ [email protected], [email protected] ]
-    repositories:
-      - config-file-parser
-      - dast-action
-      - cli
 secrets:
   ignore:
     - value: mocksecret123

pkg/merger/merger.go

@@ -142,21 +142,6 @@ func MergeConfigFiles(
 			}
 		}
 
-		if len(extraConfig.Notifications) > 0 && config.Notifications == nil {
-			config.Notifications = map[string]models.Notification{}
-		}
-
-		for k, v := range extraConfig.Notifications {
-			config.Notifications[k] = v
-		}
-
-		if len(extraConfig.ScheduledNotifications) > 0 && config.ScheduledNotifications == nil {
-			config.ScheduledNotifications = extraConfig.ScheduledNotifications
-		}
-
-		for k, v := range extraConfig.ScheduledNotifications {
-			config.ScheduledNotifications[k] = v
-		}
 	}
 
 	return &config

pkg/merger/merger_test.go

@@ -60,20 +60,6 @@ func TestMergeConfigFiles(t *testing.T) {
 						},
 					},
 				},
-				Notifications: map[string]models.Notification{
-					"slack": {
-						Events: models.NotificationEvents{
-							All: &models.NotificationEventAll{
-								MinimumSeverity: models.SeverityHigh,
-							},
-						},
-					},
-				},
-				ScheduledNotifications: map[string]models.ScheduledNotification{
-					"slack": {
-						Schedule: "0 0 * * *",
-					},
-				},
 				Integrations: models.Integrations{
 					Jira: &models.Jira{
 						ProjectKey:        "JIRINT",
@@ -118,20 +104,6 @@ func TestMergeConfigFiles(t *testing.T) {
 						},
 					},
 				},
-				Notifications: map[string]models.Notification{
-					"slack": {
-						Events: models.NotificationEvents{
-							All: &models.NotificationEventAll{
-								MinimumSeverity: models.SeverityHigh,
-							},
-						},
-					},
-				},
-				ScheduledNotifications: map[string]models.ScheduledNotification{
-					"slack": {
-						Schedule: "0 0 * * *",
-					},
-				},
 				Integrations: models.Integrations{
 					Jira: &models.Jira{
 						ProjectKey:        "JIRINT",
@@ -176,20 +148,6 @@ func TestMergeConfigFiles(t *testing.T) {
 						},
 					},
 				},
-				Notifications: map[string]models.Notification{
-					"slack": {
-						Events: models.NotificationEvents{
-							All: &models.NotificationEventAll{
-								MinimumSeverity: models.SeverityHigh,
-							},
-						},
-					},
-				},
-				ScheduledNotifications: map[string]models.ScheduledNotification{
-					"slack": {
-						Schedule: "0 0 * * *",
-					},
-				},
 				Integrations: models.Integrations{
 					Jira: &models.Jira{
 						ProjectKey:        "JIRINT",
@@ -241,20 +199,6 @@ func TestMergeConfigFiles(t *testing.T) {
 						},
 					},
 				},
-				Notifications: map[string]models.Notification{
-					"slack": {
-						Events: models.NotificationEvents{
-							All: &models.NotificationEventAll{
-								MinimumSeverity: models.SeverityHigh,
-							},
-						},
-					},
-				},
-				ScheduledNotifications: map[string]models.ScheduledNotification{
-					"slack": {
-						Schedule: "0 0 * * *",
-					},
-				},
 				Integrations: models.Integrations{
 					Jira: &models.Jira{
 						ProjectKey:        "JIRINT",

pkg/models/models.go

@@ -13,9 +13,7 @@ type Configuration struct {
 	IgnorePaths []string `yaml:"ignore_paths,omitempty"`
 	AutoFix     *AutoFix `yaml:"auto_fix,omitempty"`
 
-	Notifications          map[string]Notification          `yaml:"notifications,omitempty"`
-	ScheduledNotifications map[string]ScheduledNotification `yaml:"scheduled_notifications,omitempty"`
-	Integrations           Integrations                     `yaml:"integrations,omitempty"`
+	Integrations Integrations `yaml:"integrations,omitempty"`
 
 	// features
 	Code         Code         `yaml:"code"`

pkg/models/notifications.go

@@ -23,8 +23,6 @@ func NewDefaultConfig() *models.Configuration {
 		Secrets: models.Secrets{
 			Ignore: nil,
 		},
-		Notifications:          nil,
-		ScheduledNotifications: nil,
-		Integrations:           models.Integrations{},
+		Integrations: models.Integrations{},
 	}
 }

pkg/models/notifications_events.go

@@ -41,24 +41,4 @@ func sanitizeConfig(config *models.Configuration) {
 		}
 		config.Integrations.Jira = j
 	}
-
-	for name, n := range config.Notifications {
-		if n.Events.All != nil {
-			n.Events.All.MinimumSeverity = strings.ToUpper(n.Events.All.MinimumSeverity)
-		}
-
-		if n.Events.NewAPIFindings != nil {
-			n.Events.NewAPIFindings.MinimumSeverity = strings.ToUpper(n.Events.NewAPIFindings.MinimumSeverity)
-		}
-
-		if n.Events.NewCodeFindings != nil {
-			n.Events.NewCodeFindings.MinimumSeverity = strings.ToUpper(n.Events.NewCodeFindings.MinimumSeverity)
-		}
-
-		if n.Events.NewDependencyFindings != nil {
-			n.Events.NewDependencyFindings.MinimumSeverity = strings.ToUpper(n.Events.NewDependencyFindings.MinimumSeverity)
-		}
-
-		config.Notifications[name] = n
-	}
 }