Update pre-commit hook golangci/golangci-lint to v1.60.2 (#201)

| datasource  | package                | from    | to      |
| ----------- | ---------------------- | ------- | ------- |
| github-tags | golangci/golangci-lint | v1.60.1 | v1.60.2 |

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -115,7 +115,7 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
         with:
-          version: latest
+          version: v2.2.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/labeler.yml

@@ -9,10 +9,18 @@ jobs:
   triage:
     permissions:
       contents: read
-      pull-requests: write
+      pull-requests: write # for actions/labeler to add labels
     runs-on: ubuntu-22.04
     steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          sparse-checkout: |
+            labeler.yml
+          sparse-checkout-cone-mode: false
+          repository: nginxinc/k8s-common
+
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true
+          configuration-path: labeler.yml

.github/workflows/lint.yml

@@ -37,6 +37,7 @@ jobs:
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
           working-directory: ${{ matrix.directory }}
+          version: v1.60.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
 
   actionlint:
     name: Actionlint

.golangci.yml

@@ -48,13 +48,13 @@ linters:
     - asciicheck
     - bidichk
     - contextcheck
+    - copyloopvar
     - dupword
     - durationcheck
     - errcheck
     - errchkjson
     - errname
     - errorlint
-    - exportloopref
     - fatcontext
     - forcetypeassert
     - ginkgolinter

.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
       - id: gitleaks
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.60.1
+    rev: v1.60.2
     hooks:
       - id: golangci-lint-full
         name: golangci-lint-root

Makefile

@@ -1,3 +1,5 @@
+# renovate: datasource=docker depName=golangci/golangci-lint
+GOLANGCI_LINT_VERSION = v1.60.1
 .DEFAULT_GOAL := help
 
 .PHONY: help
@@ -30,7 +32,7 @@ vet: ## Run go vet against code
 
 .PHONY: lint
 lint: ## Run golangci-lint against code
-	docker run --pull always --rm -v $(shell pwd):/telemetry-exporter -w /telemetry-exporter -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest golangci-lint --color always run
+	docker run --pull always --rm -v $(shell pwd):/telemetry-exporter -w /telemetry-exporter -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) golangci-lint --color always run
 
 .PHONY: dev-all
 dev-all: deps fmt vet lint unit-test ## Run all the development checks

cmd/generator/parser_test.go

@@ -177,7 +177,6 @@ func TestParseErrors(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 			g := NewGomegaWithT(t)

tests/exporter_test.go

@@ -1,13 +1,9 @@
 package tests
 
 import (
-	"bufio"
 	"context"
-	"errors"
 	"fmt"
-	"io"
 	"log/slog"
-	"os"
 	"strings"
 	"sync"
 
@@ -68,32 +64,6 @@ func (c *matchingLogConsumer) unmatchedCount() int {
 	return len(c.expectedSubstrings)
 }
 
-func getCollectorImageFromDockerfile() (string, error) {
-	dockerFile, err := os.Open("Dockerfile")
-	if err != nil {
-		return "", fmt.Errorf("failed to open Dockerfile: %w", err)
-	}
-	defer dockerFile.Close()
-
-	reader := bufio.NewReader(dockerFile)
-
-	for {
-		line, err := reader.ReadString('\n')
-		if err == io.EOF {
-			return "", errors.New("FROM not found in Dockerfile")
-		}
-		if err != nil {
-			return "", fmt.Errorf("failed to read Dockerfile: %w", err)
-		}
-
-		if !strings.HasPrefix(line, "FROM ") {
-			continue
-		}
-
-		return strings.TrimSpace(strings.TrimPrefix(line, "FROM ")), nil
-	}
-}
-
 var _ = Describe("Exporter", func() {
 	var (
 		lc        *matchingLogConsumer
@@ -106,9 +76,8 @@ var _ = Describe("Exporter", func() {
 		ctx = context.Background()
 
 		//  Run the collector container
-
-		image, err := getCollectorImageFromDockerfile()
-		Expect(err).ToNot(HaveOccurred())
+		// renovate: datasource=docker
+		image := "otel/opentelemetry-collector-contrib:0.106.1"
 
 		const collectorCfgName = "collector.yaml"
 
@@ -131,11 +100,12 @@ var _ = Describe("Exporter", func() {
 			Cmd: []string{"--config=/" + collectorCfgName},
 		}
 
-		collector, err = testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
+		var errCollector error
+		collector, errCollector = testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 			ContainerRequest: req,
 			Started:          true,
 		})
-		Expect(err).ToNot(HaveOccurred())
+		Expect(errCollector).ToNot(HaveOccurred())
 
 		// Create the exporter