Add enable flag to cli commands

cmd/pint/bench_test.go

@@ -94,7 +94,7 @@ rule {
  require.NoError(b, os.WriteFile(tmp+"/.pint.hcl", content, 0o644))
 
  ctx := context.Background()
- cfg, err := config.Load(tmp+"/.pint.hcl", false)
+ cfg, _, err := config.Load(tmp+"/.pint.hcl", false)
  require.NoError(b, err)
 
  gen := config.NewPrometheusGenerator(cfg, prometheus.NewRegistry())

cmd/pint/config.go

@@ -21,7 +21,7 @@ func actionConfig(c *cli.Context) (err error) {
  return fmt.Errorf("failed to set log level: %w", err)
  }
 
- cfg, err := config.Load(c.Path(configFlag), c.IsSet(configFlag))
+ cfg, _, err := config.Load(c.Path(configFlag), c.IsSet(configFlag))
  if err != nil {
  return fmt.Errorf("failed to load config file %q: %w", c.Path(configFlag), err)
  }

cmd/pint/main.go

@@ -14,6 +14,7 @@ import (
 const (
  configFlag = "config"
  logLevelFlag = "log-level"
+ enabledFlag = "enabled"
  disabledFlag = "disabled"
  offlineFlag = "offline"
  noColorFlag = "no-color"
@@ -59,6 +60,12 @@ func newApp() *cli.App {
  Value: cli.NewStringSlice(),
  Usage: "List of checks to disable (example: promql/cost).",
  },
+ &cli.StringSliceFlag{
+ Name: enabledFlag,
+ Aliases: []string{"e"},
+ Value: cli.NewStringSlice(),
+ Usage: "Only enable these checks (example: promql/cost).",
+ },
  &cli.BoolFlag{
  Name: offlineFlag,
  Aliases: []string{"o"},
@@ -100,11 +107,22 @@ func actionSetup(c *cli.Context) (meta actionMeta, err error) {
  return meta, fmt.Errorf("--%s flag must be > 0", workersFlag)
  }
 
- meta.cfg, err = config.Load(c.Path(configFlag), c.IsSet(configFlag))
+ var fromFile bool
+ meta.cfg, fromFile, err = config.Load(c.Path(configFlag), c.IsSet(configFlag))
  if err != nil {
  return meta, fmt.Errorf("failed to load config file %q: %w", c.Path(configFlag), err)
  }
+ if fromFile {
+ slog.Debug("Adding pint config to the parser exclude list", slog.String("path", c.Path(configFlag)))
+ meta.cfg.Parser.Exclude = append(meta.cfg.Parser.Exclude, c.Path(configFlag))
+ }
+
  meta.cfg.SetDisabledChecks(c.StringSlice(disabledFlag))
+ enabled := c.StringSlice(enabledFlag)
+ if len(enabled) > 0 {
+ meta.cfg.Checks.Enabled = enabled
+ }
+
  if c.Bool(offlineFlag) {
  meta.isOffline = true
  meta.cfg.DisableOnlineChecks()

cmd/pint/tests/0018_match_alerting.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=2
 level=DEBUG msg="Glob finder completed" count=2

cmd/pint/tests/0019_match_recording.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=2
 level=DEBUG msg="Glob finder completed" count=2

cmd/pint/tests/0020_ignore_kind.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=2
 level=DEBUG msg="Glob finder completed" count=2

cmd/pint/tests/0028_ci_git_error.txt

@@ -21,11 +21,12 @@ cmp stderr ../stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=DEBUG msg="Running git command" args=["rev-parse","--abbrev-ref","HEAD"]
 level=DEBUG msg="Got branch information" base=notmain current=v2
 level=INFO msg="Finding all rules to check on current git branch" base=notmain
 level=DEBUG msg="Excluding git directory from glob results" path=.git glob=*
-level=DEBUG msg="File parsed" path=.pint.hcl rules=0
+level=DEBUG msg="File path is in the exclude list" path=.pint.hcl exclude=["^.pint.hcl$"]
 level=DEBUG msg="File parsed" path=rules.yml rules=2
 level=DEBUG msg="Glob finder completed" count=2
 level=DEBUG msg="Running git command" args=["log","--reverse","--no-merges","--first-parent","--format=%H","--name-status","notmain..HEAD"]

cmd/pint/tests/0037_disable_checks.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=3
 level=DEBUG msg="Glob finder completed" count=3

cmd/pint/tests/0039_prom_selected_path.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=3
 level=DEBUG msg="Glob finder completed" count=3

cmd/pint/tests/0040_rule_match_label.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/rules.yml rules=4
 level=DEBUG msg="Glob finder completed" count=4

cmd/pint/tests/0052_match_multiple.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=2
 level=DEBUG msg="Glob finder completed" count=2

cmd/pint/tests/0053_ignore_multiple.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=2
 level=DEBUG msg="Glob finder completed" count=2

cmd/pint/tests/0095_rulefmt_symlink.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/relaxed/1.yml rules=1
 level=DEBUG msg="File parsed" path=rules/strict/symlink.yml rules=1

cmd/pint/tests/0099_symlink_outside_glob.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules/relaxed"]
 level=DEBUG msg="File parsed" path=rules/relaxed/1.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0103_file_disable.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0111_snooze.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0112_expired_snooze.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0115_file_disable_tag.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0116_file_snooze.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="Check snoozed by comment" check=promql/aggregate(job:true) match=promql/aggregate(job:true) until="2099-11-28T10:24:18Z"
 level=DEBUG msg="Check snoozed by comment" check=alerts/for match=alerts/for until="2099-11-28T10:24:18Z"

cmd/pint/tests/0134_ci_base_branch_flag_path.txt

@@ -21,11 +21,12 @@ cmp stderr ../stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=DEBUG msg="Running git command" args=["rev-parse","--abbrev-ref","HEAD"]
 level=DEBUG msg="Got branch information" base=origin/main current=v2
 level=INFO msg="Finding all rules to check on current git branch" base=origin/main
 level=DEBUG msg="Excluding git directory from glob results" path=.git glob=*
-level=DEBUG msg="File parsed" path=.pint.hcl rules=0
+level=DEBUG msg="File path is in the exclude list" path=.pint.hcl exclude=["^.pint.hcl$"]
 level=DEBUG msg="File parsed" path=rules.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1
 level=DEBUG msg="Running git command" args=["log","--reverse","--no-merges","--first-parent","--format=%H","--name-status","origin/main..HEAD"]

cmd/pint/tests/0135_ci_base_branch_config_path.txt

@@ -21,11 +21,12 @@ cmp stderr ../stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=DEBUG msg="Running git command" args=["rev-parse","--abbrev-ref","HEAD"]
 level=DEBUG msg="Got branch information" base=origin/main current=v2
 level=INFO msg="Finding all rules to check on current git branch" base=origin/main
 level=DEBUG msg="Excluding git directory from glob results" path=.git glob=*
-level=DEBUG msg="File parsed" path=.pint.hcl rules=0
+level=DEBUG msg="File path is in the exclude list" path=.pint.hcl exclude=["^.pint.hcl$"]
 level=DEBUG msg="File parsed" path=rules.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1
 level=DEBUG msg="Running git command" args=["log","--reverse","--no-merges","--first-parent","--format=%H","--name-status","origin/main..HEAD"]

cmd/pint/tests/0144_discovery_filepath.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0145_discovery_filepath_dup.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0147_discovery_filepath_error.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0148_discovery_prom_zero.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0149_discovery_prom.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0150_discovery_prom_dup_tags.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0151_discovery_prom_error.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0152_discovery_prom_dup_uptime.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0155_discovery_prom_dup_include.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0156_discovery_prom_dup_exclude.txt

@@ -7,6 +7,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
 level=DEBUG msg="Glob finder completed" count=1

cmd/pint/tests/0167_rule_duplicate_symlink.txt

@@ -28,7 +28,6 @@ cmp stderr ../stderrV1.txt
 -- stderrV1.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
 level=INFO msg="Finding all rules to check on current git branch" base=main
-level=WARN msg="Failed to parse file content" err="error at line 1: top level field must be a groups key, got string" path=.pint.hcl lines=1-20
 level=INFO msg="Configured new Prometheus server" name=prom1 uris=1 uptime=up tags=[] include=["^rules.yml$"] exclude=[]
 level=INFO msg="Configured new Prometheus server" name=prom2 uris=1 uptime=up tags=[] include=["^symlink.yml$"] exclude=[]
 -- stderrV2.txt --

cmd/pint/tests/0169_watch_rule_files_noprom.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Configured new Prometheus server" name=foo uris=1 uptime=up tags=[] include=[] exclude=[]
 level=DEBUG msg="Starting query workers" name=foo uri=http://localhost:7169 workers=16
 level=ERROR msg="Fatal error" err="no Prometheus named \"prom\" configured in pint"

cmd/pint/tests/0170_watch_rule_files_error.txt

@@ -8,6 +8,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Configured new Prometheus server" name=prom uris=1 uptime=up tags=[] include=[] exclude=[]
 level=DEBUG msg="Starting query workers" name=prom uri=http://localhost:7170 workers=16
 level=DEBUG msg="Starting rule_fules watch" name=prom

cmd/pint/tests/0173_rule_duplicate_move.txt

@@ -25,7 +25,6 @@ cmp stderr ../stderr.txt
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
 level=INFO msg="Finding all rules to check on current git branch" base=main
-level=WARN msg="Failed to parse file content" err="error at line 1: top level field must be a groups key, got string" path=.pint.hcl lines=1-24
 level=INFO msg="Configured new Prometheus server" name=prom1 uris=1 uptime=up tags=[] include=["^rules/alert.*$"] exclude=[]
 level=INFO msg="Configured new Prometheus server" name=prom2a uris=1 uptime=up tags=[] include=["^rules/record.*$"] exclude=[]
 level=INFO msg="Configured new Prometheus server" name=prom2b uris=1 uptime=up tags=[] include=["^rules/record.*$"] exclude=[]

cmd/pint/tests/0178_parser_include.txt

@@ -4,6 +4,7 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File path is in the include list" path=rules/0001.yml include=["^rules/0001.yml$"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1

cmd/pint/tests/0179_parser_exclude.txt

@@ -4,9 +4,10 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
-level=DEBUG msg="File path is in the exclude list" path=rules/0002.yml exclude=["^rules/0002.yml$"]
+level=DEBUG msg="File path is in the exclude list" path=rules/0002.yml exclude=["^rules/0002.yml$","^.pint.hcl$"]
 level=DEBUG msg="Glob finder completed" count=1
 level=DEBUG msg="Generated all Prometheus servers" count=0
 level=DEBUG msg="Found recording rule" path=rules/0001.yml record=ok lines=1-2

cmd/pint/tests/0180_parser_exclude_md.txt

@@ -4,9 +4,10 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=INFO msg="Loading configuration file" path=.pint.hcl
+level=DEBUG msg="Adding pint config to the parser exclude list" path=.pint.hcl
 level=INFO msg="Finding all rules to check" paths=["rules"]
 level=DEBUG msg="File parsed" path=rules/0001.yml rules=1
-level=DEBUG msg="File path is in the exclude list" path=rules/README.md exclude=["^.*.md$"]
+level=DEBUG msg="File path is in the exclude list" path=rules/README.md exclude=["^.*.md$","^.pint.hcl$"]
 level=DEBUG msg="Glob finder completed" count=1
 level=DEBUG msg="Generated all Prometheus servers" count=0
 level=DEBUG msg="Found recording rule" path=rules/0001.yml record=ok lines=1-2