Merge pull request moby#5076 from daghack/parse-lint-to-linter

Move parseLintOptions into linter package

Author: tonistiigi

frontend/dockerfile/dockerfile2llb/convert.go

@@ -169,59 +169,17 @@ func ListTargets(ctx context.Context, dt []byte) (*targets.List, error) {
 	return l, nil
 }
 
-func parseLintOptions(checkStr string) (*linter.Config, error) {
-	checkStr = strings.TrimSpace(checkStr)
-	if checkStr == "" {
-		return &linter.Config{}, nil
-	}
-
-	parts := strings.SplitN(checkStr, ";", 2)
-	var skipSet []string
-	var errorOnWarn, skipAll bool
-	for _, p := range parts {
-		k, v, ok := strings.Cut(p, "=")
-		if !ok {
-			return nil, errors.Errorf("invalid check option %q", p)
-		}
-		k = strings.TrimSpace(k)
-		switch k {
-		case "skip":
-			v = strings.TrimSpace(v)
-			if v == "all" {
-				skipAll = true
-			} else {
-				skipSet = strings.Split(v, ",")
-				for i, rule := range skipSet {
-					skipSet[i] = strings.TrimSpace(rule)
-				}
-			}
-		case "error":
-			v, err := strconv.ParseBool(strings.TrimSpace(v))
-			if err != nil {
-				return nil, errors.Wrapf(err, "failed to parse check option %q", p)
-			}
-			errorOnWarn = v
-		default:
-			return nil, errors.Errorf("invalid check option %q", k)
-		}
-	}
-	return &linter.Config{
-		SkipRules:     skipSet,
-		SkipAll:       skipAll,
-		ReturnAsError: errorOnWarn,
-	}, nil
-}
-
 func newRuleLinter(dt []byte, opt *ConvertOpt) (*linter.Linter, error) {
-	var lintOptionStr string
+	var lintConfig *linter.Config
 	if opt.Client != nil && opt.Client.LinterConfig != nil {
-		lintOptionStr = *opt.Client.LinterConfig
+		lintConfig = opt.Client.LinterConfig
 	} else {
-		lintOptionStr, _, _, _ = parser.ParseDirective("check", dt)
-	}
-	lintConfig, err := parseLintOptions(lintOptionStr)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to parse check options")
+		var err error
+		lintOptionStr, _, _, _ := parser.ParseDirective("check", dt)
+		lintConfig, err = linter.ParseLintOptions(lintOptionStr)
+		if err != nil {
+			return nil, errors.Wrapf(err, "failed to parse check options")
+		}
 	}
 	lintConfig.Warn = opt.Warn
 	return linter.New(lintConfig), nil

frontend/dockerfile/linter/linter.go

@@ -2,6 +2,7 @@ package linter
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/moby/buildkit/frontend/dockerfile/parser"
@@ -100,3 +101,46 @@ func LintFormatShort(rulename, msg string, line int) string {
 }
 
 type LintWarnFunc func(rulename, description, url, fmtmsg string, location []parser.Range)
+
+func ParseLintOptions(checkStr string) (*Config, error) {
+	checkStr = strings.TrimSpace(checkStr)
+	if checkStr == "" {
+		return &Config{}, nil
+	}
+
+	parts := strings.SplitN(checkStr, ";", 2)
+	var skipSet []string
+	var errorOnWarn, skipAll bool
+	for _, p := range parts {
+		k, v, ok := strings.Cut(p, "=")
+		if !ok {
+			return nil, errors.Errorf("invalid check option %q", p)
+		}
+		k = strings.TrimSpace(k)
+		switch k {
+		case "skip":
+			v = strings.TrimSpace(v)
+			if v == "all" {
+				skipAll = true
+			} else {
+				skipSet = strings.Split(v, ",")
+				for i, rule := range skipSet {
+					skipSet[i] = strings.TrimSpace(rule)
+				}
+			}
+		case "error":
+			v, err := strconv.ParseBool(strings.TrimSpace(v))
+			if err != nil {
+				return nil, errors.Wrapf(err, "failed to parse check option %q", p)
+			}
+			errorOnWarn = v
+		default:
+			return nil, errors.Errorf("invalid check option %q", k)
+		}
+	}
+	return &Config{
+		SkipRules:     skipSet,
+		SkipAll:       skipAll,
+		ReturnAsError: errorOnWarn,
+	}, nil
+}

frontend/dockerui/config.go

@@ -14,6 +14,7 @@ import (
 	controlapi "github.com/moby/buildkit/api/services/control"
 	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/frontend/attestations"
+	"github.com/moby/buildkit/frontend/dockerfile/linter"
 	"github.com/moby/buildkit/frontend/gateway/client"
 	"github.com/moby/buildkit/solver/pb"
 	"github.com/moby/buildkit/util/flightcontrol"
@@ -65,7 +66,7 @@ type Config struct {
 	ShmSize          int64
 	Target           string
 	Ulimits          []pb.Ulimit
-	LinterConfig     *string
+	LinterConfig     *linter.Config
 
 	CacheImports           []client.CacheOptionsEntry
 	TargetPlatforms        []ocispecs.Platform // nil means default
@@ -280,7 +281,10 @@ func (bc *Client) init() error {
 	bc.Hostname = opts[keyHostname]
 
 	if v, ok := opts[keyDockerfileLintArg]; ok {
-		bc.LinterConfig = &v
+		bc.LinterConfig, err = linter.ParseLintOptions(v)
+		if err != nil {
+			return errors.Wrapf(err, "failed to parse %s", keyDockerfileLintArg)
+		}
 	}
 	return nil
 }