refactor: stick with saving as config map s not holding pointers

Author: G-Rath

pkg/osvscanner/configs.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ossf/osv-schema/bindings/go/osvschema"
 )
 
-func addVulnConfigIgnores(vulnResults *models.VulnerabilityResults, manager *config.Manager) {
+func addVulnConfigIgnoresAndSave(vulnResults *models.VulnerabilityResults, manager *config.Manager) error {
 	configVulns := make(map[string][]*osvschema.Vulnerability)
 	configPaths := make(map[string]config.Config)
 
@@ -31,26 +31,20 @@ func addVulnConfigIgnores(vulnResults *models.VulnerabilityResults, manager *con
 		c := configPaths[p]
 
 		c.IgnoreVulns(vulns)
-	}
-}
-
-func removeAllUnusedConfigIgnores(manager *config.Manager) {
-	if manager.OverrideConfig != nil {
-		manager.OverrideConfig.RemoveUnusedIgnores()
-	}
 
-	for _, c := range manager.ConfigMap {
-		// skip the default config
-		if c.LoadPath == "" {
-			continue
+		err := c.Save()
+		if err != nil {
+			return err
 		}
-
-		c.RemoveUnusedIgnores()
 	}
+
+	return nil
 }
 
-func saveAllConfigs(manager *config.Manager) error {
+func removeAllUnusedConfigIgnoresAndSave(manager *config.Manager) error {
 	if manager.OverrideConfig != nil {
+		manager.OverrideConfig.RemoveUnusedIgnores()
+
 		err := manager.OverrideConfig.Save()
 		if err != nil {
 			return err
@@ -63,6 +57,8 @@ func saveAllConfigs(manager *config.Manager) error {
 			continue
 		}
 
+		c.RemoveUnusedIgnores()
+
 		err := c.Save()
 		if err != nil {
 			return err

pkg/osvscanner/osvscanner.go

@@ -421,7 +421,11 @@ func finalizeScanResult(scanResult results.ScanResults, actions ScannerActions)
 	//  - c: filtering removes vulns from results, so need to account for that
 	if actions.UpdateConfigIgnores == "all" {
 		// todo: add output about having ignored vulns
-		addVulnConfigIgnores(&vulnerabilityResults, &scanResult.ConfigManager)
+		err := addVulnConfigIgnoresAndSave(&vulnerabilityResults, &scanResult.ConfigManager)
+
+		if err != nil {
+			return models.VulnerabilityResults{}, err
+		}
 	}
 
 	filtered := filterResults(&vulnerabilityResults, &scanResult.ConfigManager, actions.ShowAllPackages)
@@ -435,11 +439,7 @@ func finalizeScanResult(scanResult results.ScanResults, actions ScannerActions)
 
 	if actions.UpdateConfigIgnores == "unused" {
 		// todo: add output about having ignored vulns
-		removeAllUnusedConfigIgnores(&scanResult.ConfigManager)
-	}
-
-	if actions.UpdateConfigIgnores != "" && actions.UpdateConfigIgnores != "none" {
-		err := saveAllConfigs(&scanResult.ConfigManager)
+		err := removeAllUnusedConfigIgnoresAndSave(&scanResult.ConfigManager)
 
 		if err != nil {
 			return models.VulnerabilityResults{}, err