Merge pull request #746 from Elizafox/pkglint

Extricate config stuff from linter.
chainguard-dev · Oct 10, 2023 · 3342136 · 3342136
2 parents 2c1195f + 4156090
commit 3342136
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/pkg/build/build.go b/pkg/build/build.go
@@ -1067,7 +1067,6 @@ func (b *Build) BuildPackage(ctx context.Context) error {
 		// add the main package to the linter queue
 		lintTarget := linterTarget{
 			pkgName: b.Configuration.Package.Name,
-			checks:  b.Configuration.Package.Checks,
 		}
 		linterQueue = append(linterQueue, lintTarget)
 	}
@@ -1121,7 +1120,6 @@ func (b *Build) BuildPackage(ctx context.Context) error {
 		// add the main package to the linter queue
 		lintTarget := linterTarget{
 			pkgName: sp.Name,
-			checks:  sp.Checks,
 		}
 		linterQueue = append(linterQueue, lintTarget)
 	}
@@ -1139,7 +1137,7 @@ func (b *Build) BuildPackage(ctx context.Context) error {
 
 		path := filepath.Join(b.WorkspaceDir, "melange-out", lt.pkgName)
 		fsys := os.DirFS(path)
-		lctx := linter.NewLinterContext(lt.pkgName, fsys, &b.Configuration, &lt.checks)
+		lctx := linter.NewLinterContext(lt.pkgName, fsys)
 		linters := lt.checks.GetLinters()
 
 		var innerErr error

diff --git a/pkg/linter/linter.go b/pkg/linter/linter.go
@@ -22,19 +22,15 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-
-	"chainguard.dev/melange/pkg/config"
 )
 
 type LinterContext struct {
 	pkgname string
 	fsys    fs.FS
-	cfg     *config.Configuration
-	chk     *config.Checks
 }
 
-func NewLinterContext(name string, fsys fs.FS, cfg *config.Configuration, chk *config.Checks) LinterContext {
-	return LinterContext{name, fsys, cfg, chk}
+func NewLinterContext(name string, fsys fs.FS) LinterContext {
+	return LinterContext{name, fsys}
 }
 
 type linterFunc func(lctx LinterContext, path string, d fs.DirEntry) error

diff --git a/pkg/linter/linter_test.go b/pkg/linter/linter_test.go
@@ -45,7 +45,7 @@ func Test_emptyLinter(t *testing.T) {
 	linters := cfg.Package.Checks.GetLinters()
 	assert.Equal(t, linters, []string{"empty"})
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -78,7 +78,7 @@ func Test_usrLocalLinter(t *testing.T) {
 	linters := cfg.Package.Checks.GetLinters()
 	assert.Equal(t, linters, []string{"usrlocal"})
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -112,7 +112,7 @@ func Test_varEmptyLinter(t *testing.T) {
 	linters := cfg.Package.Checks.GetLinters()
 	assert.Equal(t, linters, []string{"varempty"})
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -146,7 +146,7 @@ func Test_devLinter(t *testing.T) {
 	linters := cfg.Package.Checks.GetLinters()
 	assert.Equal(t, linters, []string{"dev"})
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -180,7 +180,7 @@ func Test_optLinter(t *testing.T) {
 	linters := cfg.Package.Checks.GetLinters()
 	assert.Equal(t, linters, []string{"opt"})
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -214,7 +214,7 @@ func Test_srvLinter(t *testing.T) {
 	linters := cfg.Package.Checks.GetLinters()
 	assert.Equal(t, linters, []string{"srv"})
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -260,7 +260,7 @@ func Test_tempDirLinter(t *testing.T) {
 	assert.NoError(t, err)
 	_, err = os.Create(filename)
 	assert.NoError(t, err)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -319,7 +319,7 @@ func Test_setUidGidLinter(t *testing.T) {
 	linters := cfg.Package.Checks.GetLinters()
 	assert.Equal(t, linters, []string{"setuidgid"})
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -352,7 +352,7 @@ func Test_worldWriteLinter(t *testing.T) {
 	linters := cfg.Package.Checks.GetLinters()
 	assert.Equal(t, linters, []string{"worldwrite"})
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true
@@ -425,7 +425,7 @@ func Test_disableDefaultLinter(t *testing.T) {
 
 	linters := cfg.Package.Checks.GetLinters()
 	fsys := os.DirFS(dir)
-	lctx := NewLinterContext(cfg.Package.Name, fsys, &cfg, &cfg.Package.Checks)
+	lctx := NewLinterContext(cfg.Package.Name, fsys)
 	called := false
 	assert.NoError(t, lctx.LintPackageFs(fsys, func(err error) {
 		called = true