fix tests

Author: tim-thacker-nullify

pkg/merger/merger.go

@@ -125,6 +125,10 @@ func MergeConfigFiles(
 			}
 		}
 
+		if extraConfig.AttackSurface != nil {
+			config.AttackSurface = extraConfig.AttackSurface
+		}
+
 		if len(extraConfig.Notifications) > 0 && config.Notifications == nil {
 			config.Notifications = extraConfig.Notifications
 		}

pkg/merger/merger_test.go

@@ -334,6 +334,30 @@ func TestMergeConfigFiles(t *testing.T) {
 				PriorityThreshold:        models.PriorityImportant,
 			},
 		},
+		{
+			name: "only global config for attack surface monitoring",
+			globalConfig: &models.Configuration{
+				AttackSurface: &models.AttackSurface{
+					Enable:             true,
+					EnableDNSTraversal: true,
+					DomainNames:        []string{"example.com"},
+					IgnoreDomainNames:  []string{"example2.com"},
+				},
+			},
+			repoConfig: nil,
+			expected: &models.Configuration{
+				EnablePullRequestReviews: models.Bool(true),
+				EnableIssueDashboards:    models.Bool(true),
+				SeverityThreshold:        parser.DefaultSeverityThreshold,
+				PriorityThreshold:        parser.DefaultPriorityThreshold,
+				AttackSurface: &models.AttackSurface{
+					Enable:             true,
+					EnableDNSTraversal: true,
+					DomainNames:        []string{"example.com"},
+					IgnoreDomainNames:  []string{"example2.com"},
+				},
+			},
+		},
 	} {
 		t.Run(scenario.name, func(t *testing.T) {
 			config := MergeConfigFiles(parser.NewDefaultConfig(), scenario.globalConfig, scenario.repoConfig)
@@ -692,30 +716,6 @@ func TestMergeJira(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "only global config for attack surface monitoring",
-			globalConfig: &models.Configuration{
-				AttackSurface: models.AttackSurface{
-					Enable:             true,
-					EnableDNSTraversal: true,
-					DomainNames:        []string{"example.com"},
-					IgnoreDomainNames:  []string{"example2.com"},
-				},
-			},
-			repoConfig: nil,
-			expected: &models.Configuration{
-				EnablePullRequestReviews: models.Bool(true),
-				EnableIssueDashboards:    models.Bool(true),
-				SeverityThreshold:        parser.DefaultSeverityThreshold,
-				PriorityThreshold:        parser.DefaultPriorityThreshold,
-				AttackSurface: models.AttackSurface{
-					Enable:             true,
-					EnableDNSTraversal: true,
-					DomainNames:        []string{"example.com"},
-					IgnoreDomainNames:  []string{"example2.com"},
-				},
-			},
-		},
 	} {
 		t.Run(scenario.name, func(t *testing.T) {
 			config := MergeConfigFiles(parser.NewDefaultConfig(), scenario.globalConfig, scenario.repoConfig)

pkg/models/models.go

@@ -18,10 +18,10 @@ type Configuration struct {
 	Integrations           Integrations                     `yaml:"integrations,omitempty"`
 
 	// features
-	Code          Code          `yaml:"code"`
-	Dependencies  Dependencies  `yaml:"dependencies"`
-	Secrets       Secrets       `yaml:"secrets"`
-	AttackSurface AttackSurface `yaml:"attack_surface"`
+	Code          Code           `yaml:"code"`
+	Dependencies  Dependencies   `yaml:"dependencies"`
+	Secrets       Secrets        `yaml:"secrets"`
+	AttackSurface *AttackSurface `yaml:"attack_surface,omitempty"`
 
 	// TODO deprecate
 	SecretsWhitelist []string `yaml:"secrets_whitelist,omitempty"`

tests/integration_test.go

@@ -153,7 +153,7 @@ func TestIntegration(t *testing.T) {
 				OnFixTransition:   "Done",
 			},
 		},
-		AttackSurface: models.AttackSurface{
+		AttackSurface: &models.AttackSurface{
 			Enable:             true,
 			EnableDNSTraversal: true,
 			DomainNames:        []string{"172.36.255.7", "example.com"},