wip

tim-thacker-nullify · tim-thacker-nullify · commit 24a3c4b8480c · 2025-11-14T17:30:05.000-08:00
diff --git a/pkg/merger/merger.go b/pkg/merger/merger.go
@@ -104,18 +104,10 @@ func MergeConfigFiles(
 			config.IgnorePaths = extraConfig.IgnorePaths
 		}
 
-		if extraConfig.Code.AutoFix != nil {
-			config.Code.AutoFix = extraConfig.Code.AutoFix
-		}
-
 		if len(extraConfig.Code.Ignore) > 0 {
 			config.Code.Ignore = extraConfig.Code.Ignore
 		}
 
-		if extraConfig.Dependencies.AutoFix != nil {
-			config.Dependencies.AutoFix = extraConfig.Dependencies.AutoFix
-		}
-
 		if len(extraConfig.Dependencies.Ignore) > 0 {
 			config.Dependencies.Ignore = extraConfig.Dependencies.Ignore
 		}
diff --git a/pkg/merger/merger_test.go b/pkg/merger/merger_test.go
@@ -34,19 +34,13 @@ func TestMergeConfigFiles(t *testing.T) {
 				IgnoreDirs:        []string{"dir1", "dir2"},
 				IgnorePaths:       []string{"path1", "path2"},
 				Code: models.Code{
-					AutoFix: &models.AutoFix{
-						Enabled: true,
-					},
 					Ignore: []models.CodeIgnore{
 						{
 							CWEs: []int{123},
 						},
 					},
 				},
 				Dependencies: models.Dependencies{
-					AutoFix: &models.AutoFix{
-						Enabled: true,
-					},
 					Ignore: []models.DependenciesIgnore{
 						{
 							CVEs: []string{"CVE-2021-1234"},
@@ -78,19 +72,13 @@ func TestMergeConfigFiles(t *testing.T) {
 				IgnoreDirs:               []string{"dir1", "dir2"},
 				IgnorePaths:              []string{"path1", "path2"},
 				Code: models.Code{
-					AutoFix: &models.AutoFix{
-						Enabled: true,
-					},
 					Ignore: []models.CodeIgnore{
 						{
 							CWEs: []int{123},
 						},
 					},
 				},
 				Dependencies: models.Dependencies{
-					AutoFix: &models.AutoFix{
-						Enabled: true,
-					},
 					Ignore: []models.DependenciesIgnore{
 						{
 							CVEs: []string{"CVE-2021-1234"},
@@ -122,19 +110,13 @@ func TestMergeConfigFiles(t *testing.T) {
 				IgnoreDirs:        []string{"dir1", "dir2"},
 				IgnorePaths:       []string{"path1", "path2"},
 				Code: models.Code{
-					AutoFix: &models.AutoFix{
-						Enabled: true,
-					},
 					Ignore: []models.CodeIgnore{
 						{
 							CWEs: []int{123},
 						},
 					},
 				},
 				Dependencies: models.Dependencies{
-					AutoFix: &models.AutoFix{
-						Enabled: true,
-					},
 					Ignore: []models.DependenciesIgnore{
 						{
 							CVEs: []string{"CVE-2021-1234"},
@@ -173,19 +155,13 @@ func TestMergeConfigFiles(t *testing.T) {
 				IgnoreDirs:               []string{"dir1", "dir2"},
 				IgnorePaths:              []string{"path1", "path2"},
 				Code: models.Code{
-					AutoFix: &models.AutoFix{
-						Enabled: true,
-					},
 					Ignore: []models.CodeIgnore{
 						{
 							CWEs: []int{123},
 						},
 					},
 				},
 				Dependencies: models.Dependencies{
-					AutoFix: &models.AutoFix{
-						Enabled: true,
-					},
 					Ignore: []models.DependenciesIgnore{
 						{
 							CVEs: []string{"CVE-2021-1234"},
diff --git a/pkg/models/autofix.go b/pkg/models/autofix.go
diff --git a/pkg/models/code.go b/pkg/models/code.go
@@ -3,9 +3,6 @@ package models
 type Code struct {
 	EnableFailBuilds *bool        `yaml:"enable_fail_builds,omitempty"`
 	Ignore           []CodeIgnore `yaml:"ignore,omitempty"`
-
-	// TODO deprecate
-	AutoFix *AutoFix `yaml:"auto_fix,omitempty"`
 }
 
 type CodeIgnore struct {
diff --git a/pkg/models/dependencies.go b/pkg/models/dependencies.go
@@ -3,9 +3,6 @@ package models
 type Dependencies struct {
 	EnableFailBuilds *bool                `yaml:"enable_fail_builds,omitempty"`
 	Ignore           []DependenciesIgnore `yaml:"ignore,omitempty"`
-
-	// TODO deprecate
-	AutoFix *AutoFix `yaml:"auto_fix,omitempty"`
 }
 
 type DependenciesIgnore struct {
diff --git a/pkg/models/models.go b/pkg/models/models.go
@@ -11,7 +11,6 @@ type Configuration struct {
 
 	IgnoreDirs  []string `yaml:"ignore_dirs,omitempty"`
 	IgnorePaths []string `yaml:"ignore_paths,omitempty"`
-	AutoFix     *AutoFix `yaml:"auto_fix,omitempty"`
 
 	Integrations Integrations `yaml:"integrations,omitempty"`
 
diff --git a/pkg/validator/autofix.go b/pkg/validator/autofix.go
diff --git a/pkg/validator/autofix_test.go b/pkg/validator/autofix_test.go
diff --git a/pkg/validator/validate.go b/pkg/validator/validate.go
@@ -11,8 +11,7 @@ import (
 // ValidateConfig return true if provided configuration is valid
 func ValidateConfig(config *models.Configuration) bool {
 	return ValidateSeverityThreshold(config) &&
-		ValidatePaths(config) &&
-		ValidateAutoFix(config)
+		ValidatePaths(config)
 }
 
 func IsConfigValid(ctx context.Context, configString string) (bool, error) {

Original file line number	Diff line number	Diff line change
`@@ -104,18 +104,10 @@ func MergeConfigFiles(`
`104`	`104`	`config.IgnorePaths = extraConfig.IgnorePaths`
`105`	`105`	`}`
`106`	`106`
`107`		`- if extraConfig.Code.AutoFix != nil {`
`108`		`- config.Code.AutoFix = extraConfig.Code.AutoFix`
`109`		`- }`
`110`		`-`
`111`	`107`	`if len(extraConfig.Code.Ignore) > 0 {`
`112`	`108`	`config.Code.Ignore = extraConfig.Code.Ignore`
`113`	`109`	`}`
`114`	`110`
`115`		`- if extraConfig.Dependencies.AutoFix != nil {`
`116`		`- config.Dependencies.AutoFix = extraConfig.Dependencies.AutoFix`
`117`		`- }`
`118`		`-`
`119`	`111`	`if len(extraConfig.Dependencies.Ignore) > 0 {`
`120`	`112`	`config.Dependencies.Ignore = extraConfig.Dependencies.Ignore`
`121`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@ package models`
`3`	`3`	`type Code struct {`
`4`	`4`	EnableFailBuilds *bool `yaml:"enable_fail_builds,omitempty"`
`5`	`5`	Ignore []CodeIgnore `yaml:"ignore,omitempty"`
`6`		`-`
`7`		`- // TODO deprecate`
`8`		- AutoFix *AutoFix `yaml:"auto_fix,omitempty"`
`9`	`6`	`}`
`10`	`7`
`11`	`8`	`type CodeIgnore struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@ package models`
`3`	`3`	`type Dependencies struct {`
`4`	`4`	EnableFailBuilds *bool `yaml:"enable_fail_builds,omitempty"`
`5`	`5`	Ignore []DependenciesIgnore `yaml:"ignore,omitempty"`
`6`		`-`
`7`		`- // TODO deprecate`
`8`		- AutoFix *AutoFix `yaml:"auto_fix,omitempty"`
`9`	`6`	`}`
`10`	`7`
`11`	`8`	`type DependenciesIgnore struct {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@ import (`
`11`	`11`	`// ValidateConfig return true if provided configuration is valid`
`12`	`12`	`func ValidateConfig(config *models.Configuration) bool {`
`13`	`13`	`return ValidateSeverityThreshold(config) &&`
`14`		`- ValidatePaths(config) &&`
`15`		`- ValidateAutoFix(config)`
	`14`	`+ ValidatePaths(config)`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`func IsConfigValid(ctx context.Context, configString string) (bool, error) {`