lint revive: lower complexity threshold (#4056)

Author: mmetc

.golangci.yml

@@ -213,7 +213,7 @@ linters:
 
     maintidx:
       # raise this after refactoring
-      under: 20
+      under: 21
 
     misspell:
       locale: US
@@ -242,7 +242,7 @@ linters:
         - name: cognitive-complexity
           arguments:
             # lower this after refactoring
-            - 113
+            - 91
         - name: comment-spacings
           disabled: true
         - name: confusing-results

pkg/dumps/parser_dump.go

@@ -184,21 +184,9 @@ func (t *tree) displayResults(opts DumpOpts) {
 			}
 		}
 
-		fmt.Printf("line: %s\n", rawstr)
+		fmt.Fprintf(os.Stdout, "line: %s\n", rawstr)
 
-		skeys := make([]string, 0, len(t.state[tstamp]))
-
-		for k := range t.state[tstamp] {
-			// there is a trick : to know if an event successfully exit the parsers, we check if it reached the pour() phase
-			// we thus use a fake stage "buckets" and a fake parser "OK" to know if it entered
-			if k == "buckets" {
-				continue
-			}
-
-			skeys = append(skeys, k)
-		}
-
-		sort.Strings(skeys)
+		skeys := sortedStages(t.state[tstamp])
 
 		// iterate stage
 		var prevItem pipeline.Event
@@ -209,7 +197,7 @@ func (t *tree) displayResults(opts DumpOpts) {
 			sep := "├"
 			presep := "|"
 
-			fmt.Printf("\t%s %s\n", sep, stage)
+			fmt.Fprintf(os.Stdout, "\t%s %s\n", sep, stage)
 
 			for idx, parser := range t.parserOrder[stage] {
 				res := parsers[parser].Success
@@ -289,60 +277,83 @@ func (t *tree) displayResults(opts DumpOpts) {
 				}
 
 				if res {
-					fmt.Printf("\t%s\t%s %s %s (%s)\n", presep, sep, emoji.GreenCircle, parser, changeStr)
+					fmt.Fprintf(os.Stdout, "\t%s\t%s %s %s (%s)\n", presep, sep, emoji.GreenCircle, parser, changeStr)
 
 					if opts.Details {
-						fmt.Print(detailsDisplay)
+						fmt.Fprint(os.Stdout, detailsDisplay)
 					}
 				} else if opts.ShowNotOkParsers {
-					fmt.Printf("\t%s\t%s %s %s\n", presep, sep, emoji.RedCircle, parser)
+					fmt.Fprintf(os.Stdout, "\t%s\t%s %s %s\n", presep, sep, emoji.RedCircle, parser)
 				}
 			}
 		}
 
-		sep := "└"
+		buckets := t.state[tstamp]["buckets"]
+		displayBucketSection(buckets, whitelistReason)
+	}
+}
 
-		if len(t.state[tstamp]["buckets"]) > 0 {
-			sep = "├"
-		}
+func sortedStages(state map[string]map[string]ParserResult) []string {
+    ret := make([]string, 0, len(state))
 
-		// did the event enter the bucket pour phase ?
-		if _, ok := t.state[tstamp]["buckets"]["OK"]; ok {
-			fmt.Printf("\t%s-------- parser success %s\n", sep, emoji.GreenCircle)
-		} else if whitelistReason != "" {
-			fmt.Printf("\t%s-------- parser success, ignored by whitelist (%s) %s\n", sep, whitelistReason, emoji.GreenCircle)
-		} else {
-			fmt.Printf("\t%s-------- parser failure %s\n", sep, emoji.RedCircle)
-		}
+    for k := range state {
+	// there is a trick: to know if an event successfully exit the parsers, we check if it reached the pour() phase
+	// we thus use a fake stage "buckets" and a fake parser "OK" to know if it entered
+        if k == "buckets" {
+            continue
+        }
 
-		// now print bucket info
-		if len(t.state[tstamp]["buckets"]) > 0 {
-			fmt.Print("\t├ Scenarios\n")
-		}
+        ret = append(ret, k)
+    }
 
-		bnames := make([]string, 0, len(t.state[tstamp]["buckets"]))
+    sort.Strings(ret)
 
-		for k := range t.state[tstamp]["buckets"] {
-			// there is a trick : to know if an event successfully exit the parsers, we check if it reached the pour() phase
-			// we thus use a fake stage "buckets" and a fake parser "OK" to know if it entered
-			if k == "OK" {
-				continue
-			}
+    return ret
+}
+
+func displayBucketSection(buckets map[string]ParserResult, whitelistReason string) {
+	sep := "└"
+
+	if len(buckets) > 0 {
+		sep = "├"
+	}
+
+	// did the event enter the bucket pour phase ?
+	if _, ok := buckets["OK"]; ok {
+		fmt.Fprintf(os.Stdout, "\t%s-------- parser success %s\n", sep, emoji.GreenCircle)
+	} else if whitelistReason != "" {
+		fmt.Fprintf(os.Stdout, "\t%s-------- parser success, ignored by whitelist (%s) %s\n", sep, whitelistReason, emoji.GreenCircle)
+	} else {
+		fmt.Fprintf(os.Stdout, "\t%s-------- parser failure %s\n", sep, emoji.RedCircle)
+	}
 
-			bnames = append(bnames, k)
+	// now print bucket info
+	if len(buckets) > 0 {
+		fmt.Fprint(os.Stdout, "\t├ Scenarios\n")
+	}
+
+	bnames := make([]string, 0, len(buckets))
+
+	for k := range buckets {
+		// there is a trick : to know if an event successfully exit the parsers, we check if it reached the pour() phase
+		// we thus use a fake stage "buckets" and a fake parser "OK" to know if it entered
+		if k == "OK" {
+			continue
 		}
 
-		sort.Strings(bnames)
+		bnames = append(bnames, k)
+	}
 
-		for idx, bname := range bnames {
-			sep := "├"
-			if idx == len(bnames)-1 {
-				sep = "└"
-			}
+	sort.Strings(bnames)
 
-			fmt.Printf("\t\t%s %s %s\n", sep, emoji.GreenCircle, bname)
+	for idx, bname := range bnames {
+		sep := "├"
+		if idx == len(bnames)-1 {
+			sep = "└"
 		}
 
-		fmt.Println()
+		fmt.Fprintf(os.Stdout, "\t\t%s %s %s\n", sep, emoji.GreenCircle, bname)
 	}
+
+	fmt.Fprintln(os.Stdout)
 }