Merge remote-tracking branch 'upstream/main' into becca/node-20

kolide · Jul 8, 2024 · 60cf4b2 · 60cf4b2
2 parents 6a4de1c + 3204ad5
commit 60cf4b2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -31,6 +31,8 @@ jobs:
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
+        with:
+          skip-save-cache: true
 
       # Run again as a workaround for https://github.com/golangci/golangci-lint-action/issues/362
       - name: golangci-lint

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,4 @@
 run:
-  skip-dirs:
-    - test-cmds
   timeout: 5m
 
 linters:
@@ -15,7 +13,7 @@ linters:
     - nakedret
     - paralleltest
     - revive
-    # - sloglint # TODO -- re-enable once golangci-lint bumps to sloglint v0.7.1
+    - sloglint
     - sqlclosecheck
     - staticcheck
     - unconvert
@@ -28,7 +26,7 @@ linters:
 
 linters-settings:
   errcheck:
-    ignore: github.com/go-kit/kit/log:Log
+    exclude-functions: github.com/go-kit/kit/log:Log
   gofmt:
     simplify: false
   forbidigo:
@@ -78,3 +76,5 @@ issues:
     - linters:
         - paralleltest
       text: "does not use range value in test Run"
+  exclude-dirs:
+    - test-cmds
diff --git a/ee/dataflatten/flatten.go b/ee/dataflatten/flatten.go
@@ -378,7 +378,7 @@ func (fl *Flattener) queryMatchArrayElement(data interface{}, arrIndex int, quer
 		"caller", "queryMatchArrayElement",
 		"rows_so_far", len(fl.rows),
 		"query", queryTerm,
-		"arrIndex", arrIndex,
+		"arr_index", arrIndex,
 	)
 
 	// strip off the key re-write denotation before trying to match