summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMohammed Al Sahaf <[email protected]>2024-09-16 16:50:26 +0300
committerGitHub <[email protected]>2024-09-16 07:50:26 -0600
commit6ab9fb6f7424026ed67ceb112d99a4c483ef468b (patch)
tree1f1929d2653f90c9d00fa8120d6b7efd315e31d2
parentf4bf4e0097853438eb69c573bbaa0581e9b9c02d (diff)
downloadcaddy-6ab9fb6f7424026ed67ceb112d99a4c483ef468b.tar.gz
caddy-6ab9fb6f7424026ed67ceb112d99a4c483ef468b.zip
ci: update the linter action version (#6575)
* ci: update the linter action version Signed-off-by: Mohammed Al Sahaf <[email protected]> * exclude rule `G115`; disable deprecated linter Signed-off-by: Mohammed Al Sahaf <[email protected]> --------- Signed-off-by: Mohammed Al Sahaf <[email protected]>
-rw-r--r--.github/workflows/lint.yml2
-rw-r--r--.golangci.yml4
-rw-r--r--modules/caddyhttp/server.go1
3 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 94250f88f..22e13973f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -49,7 +49,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
- version: v1.60
+ version: latest
# Windows times out frequently after about 5m50s if we don't set a longer timeout.
args: --timeout 10m
diff --git a/.golangci.yml b/.golangci.yml
index 74e3503c4..e8b2a55d3 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -35,7 +35,6 @@ linters:
- errcheck
- errname
- exhaustive
- - exportloopref
- gci
- gofmt
- goimports
@@ -145,6 +144,9 @@ output:
issues:
exclude-rules:
+ - text: 'G115' # TODO: Either we should fix the issues or nuke the linter if it's bad
+ linters:
+ - gosec
# we aren't calling unknown URL
- text: 'G107' # G107: Url provided to HTTP request as taint input
linters:
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go
index 9dfa1bb6d..e301bdc68 100644
--- a/modules/caddyhttp/server.go
+++ b/modules/caddyhttp/server.go
@@ -817,7 +817,6 @@ func (s *Server) logRequest(
}
if fields == nil {
-
userID, _ := repl.GetString("http.auth.user.id")
reqBodyLength := 0