From c7f6fc5b21cf154fabe12125d2cd1b274c57cb53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Aug 2023 01:40:38 +0000
Subject: mod: do: bump github.com/golangci/golangci-lint from 1.53.3 to 1.54.0

Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.53.3 to 1.54.0.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/golangci/golangci-lint/compare/v1.53.3...v1.54.0)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 vendor/github.com/ultraware/funlen/README.md | 42 ++++++++++++++++++++++++++--
 vendor/github.com/ultraware/funlen/main.go   | 28 ++++++++++++++++---
 2 files changed, 64 insertions(+), 6 deletions(-)

(limited to 'vendor/github.com/ultraware')

diff --git a/vendor/github.com/ultraware/funlen/README.md b/vendor/github.com/ultraware/funlen/README.md
index aaf348521..af2187694 100644
--- a/vendor/github.com/ultraware/funlen/README.md
+++ b/vendor/github.com/ultraware/funlen/README.md
@@ -1,9 +1,47 @@
 # Funlen linter
 
-Funlen is a linter that checks for long functions. It can checks both on the number of lines and the number of statements.
+Funlen is a linter that checks for long functions. It can check both on the number of lines and the number of statements.
 
 The default limits are 60 lines and 40 statements. You can configure these.
 
-## Installation guide
+## Description
+
+The intent for the funlen linter is to fit a function within one screen. If you need to scroll through a long function, tracing variables back to their definition or even just finding matching brackets can become difficult.
+
+Besides checking lines there's also a separate check for the number of statements, which gives a clearer idea of how much is actually being done in a function.
+
+The default values are used internally, but might to be adjusted for your specific environment.
+
+## Installation
 
 Funlen is included in [golangci-lint](https://github.com/golangci/golangci-lint/). Install it and enable funlen.
+
+# Exclude for tests
+
+golangci-lint offers a way to exclude linters in certain cases. More info can be found here: https://golangci-lint.run/usage/configuration/#issues-configuration.
+
+## Disable funlen for \_test.go files
+
+You can utilize the issues configuration in `.golangci.yml` to exclude the funlen linter for all test files:
+
+```yaml
+issues:
+  exclude-rules:
+    # disable funlen for all _test.go files
+    - path: _test.go
+      linters:
+        - funlen
+```
+
+## Disable funlen only for Test funcs
+
+If you want to keep funlen enabled for example in helper functions in test files but disable it specifically for Test funcs, you can use the following configuration:
+
+```yaml
+issues:
+  exclude-rules:
+    # disable funlen for test funcs
+    - source: "^func Test"
+      linters:
+        - funlen
+```
diff --git a/vendor/github.com/ultraware/funlen/main.go b/vendor/github.com/ultraware/funlen/main.go
index 2ba353002..b68ddb926 100644
--- a/vendor/github.com/ultraware/funlen/main.go
+++ b/vendor/github.com/ultraware/funlen/main.go
@@ -13,7 +13,7 @@ const (
 )
 
 // Run runs this linter on the provided code
-func Run(file *ast.File, fset *token.FileSet, lineLimit, stmtLimit int) []Message {
+func Run(file *ast.File, fset *token.FileSet, lineLimit int, stmtLimit int, ignoreComments bool) []Message {
 	if lineLimit == 0 {
 		lineLimit = defaultLineLimit
 	}
@@ -21,6 +21,8 @@ func Run(file *ast.File, fset *token.FileSet, lineLimit, stmtLimit int) []Messag
 		stmtLimit = defaultStmtLimit
 	}
 
+	cmap := ast.NewCommentMap(fset, file, file.Comments)
+
 	var msgs []Message
 	for _, f := range file.Decls {
 		decl, ok := f.(*ast.FuncDecl)
@@ -36,7 +38,7 @@ func Run(file *ast.File, fset *token.FileSet, lineLimit, stmtLimit int) []Messag
 		}
 
 		if lineLimit > 0 {
-			if lines := getLines(fset, decl); lines > lineLimit {
+			if lines := getLines(fset, decl, cmap.Filter(decl), ignoreComments); lines > lineLimit {
 				msgs = append(msgs, makeLineMessage(fset, decl.Name, lines, lineLimit))
 			}
 		}
@@ -65,8 +67,26 @@ func makeStmtMessage(fset *token.FileSet, funcInfo *ast.Ident, stmts, stmtLimit
 	}
 }
 
-func getLines(fset *token.FileSet, f *ast.FuncDecl) int { // nolint: interfacer
-	return fset.Position(f.End()).Line - fset.Position(f.Pos()).Line - 1
+func getLines(fset *token.FileSet, f *ast.FuncDecl, cmap ast.CommentMap, ignoreComments bool) int { // nolint: interfacer
+	var lineCount int
+	var commentCount int
+
+	lineCount = fset.Position(f.End()).Line - fset.Position(f.Pos()).Line - 1
+
+	if !ignoreComments {
+		return lineCount
+	}
+
+	for _, c := range cmap.Comments() {
+		// If the CommenGroup's lines are inside the function
+		// count how many comments are in the CommentGroup
+		if (fset.Position(c.Pos()).Line > fset.Position(f.Pos()).Line) &&
+			(fset.Position(c.End()).Line < fset.Position(f.End()).Line) {
+			commentCount += len(c.List)
+		}
+	}
+
+	return lineCount - commentCount
 }
 
 func parseStmts(s []ast.Stmt) (total int) {
-- 
cgit mrf-deployment