Skip to content

Commit ae8a908

Browse files
authored
Remove dependabot and add more dependencies to renovate (#205)
Removes the configuration files for dependabot and uses the labeler.yml config in nginxinc/k8s-common. Also adds more dependencies for renovate and fixes linter errors
1 parent dc5be61 commit ae8a908

12 files changed

+21
-115
lines changed

.github/dependabot.yml

-21
This file was deleted.

.github/labeler.yml

-28
This file was deleted.

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
- name: Run GoReleaser
116116
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
117117
with:
118-
version: latest
118+
version: v2.2.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
119119
args: release --clean
120120
env:
121121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dependabot-auto-merge.yml

-23
This file was deleted.

.github/workflows/labeler.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,18 @@ jobs:
99
triage:
1010
permissions:
1111
contents: read
12-
pull-requests: write
12+
pull-requests: write # for actions/labeler to add labels
1313
runs-on: ubuntu-22.04
1414
steps:
15+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
with:
17+
sparse-checkout: |
18+
labeler.yml
19+
sparse-checkout-cone-mode: false
20+
repository: nginxinc/k8s-common
21+
1522
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1623
with:
1724
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1825
sync-labels: true
26+
configuration-path: labeler.yml

.github/workflows/lint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
3838
with:
3939
working-directory: ${{ matrix.directory }}
40+
version: v1.60.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
4041

4142
actionlint:
4243
name: Actionlint

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ linters:
4848
- asciicheck
4949
- bidichk
5050
- contextcheck
51+
- copyloopvar
5152
- dupword
5253
- durationcheck
5354
- errcheck
5455
- errchkjson
5556
- errname
5657
- errorlint
57-
- exportloopref
5858
- fatcontext
5959
- forcetypeassert
6060
- ginkgolinter

.pre-commit-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ repos:
5151

5252
ci:
5353
skip: [golangci-lint-full]
54+
autoupdate_schedule: quarterly # We use renovate for more frequent updates and there's no way to disable autoupdate

Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# renovate: datasource=docker depName=golangci/golangci-lint
2+
GOLANGCI_LINT_VERSION = v1.60.1
13
.DEFAULT_GOAL := help
24

35
.PHONY: help
@@ -30,7 +32,7 @@ vet: ## Run go vet against code
3032

3133
.PHONY: lint
3234
lint: ## Run golangci-lint against code
33-
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
35+
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
3436

3537
.PHONY: dev-all
3638
dev-all: deps fmt vet lint unit-test ## Run all the development checks

cmd/generator/parser_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ func TestParseErrors(t *testing.T) {
177177
}
178178

179179
for _, test := range tests {
180-
test := test
181180
t.Run(test.name, func(t *testing.T) {
182181
t.Parallel()
183182
g := NewGomegaWithT(t)

tests/Dockerfile

-3
This file was deleted.

tests/exporter_test.go

+5-35
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
package tests
22

33
import (
4-
"bufio"
54
"context"
6-
"errors"
75
"fmt"
8-
"io"
96
"log/slog"
10-
"os"
117
"strings"
128
"sync"
139

@@ -68,32 +64,6 @@ func (c *matchingLogConsumer) unmatchedCount() int {
6864
return len(c.expectedSubstrings)
6965
}
7066

71-
func getCollectorImageFromDockerfile() (string, error) {
72-
dockerFile, err := os.Open("Dockerfile")
73-
if err != nil {
74-
return "", fmt.Errorf("failed to open Dockerfile: %w", err)
75-
}
76-
defer dockerFile.Close()
77-
78-
reader := bufio.NewReader(dockerFile)
79-
80-
for {
81-
line, err := reader.ReadString('\n')
82-
if err == io.EOF {
83-
return "", errors.New("FROM not found in Dockerfile")
84-
}
85-
if err != nil {
86-
return "", fmt.Errorf("failed to read Dockerfile: %w", err)
87-
}
88-
89-
if !strings.HasPrefix(line, "FROM ") {
90-
continue
91-
}
92-
93-
return strings.TrimSpace(strings.TrimPrefix(line, "FROM ")), nil
94-
}
95-
}
96-
9767
var _ = Describe("Exporter", func() {
9868
var (
9969
lc *matchingLogConsumer
@@ -106,9 +76,8 @@ var _ = Describe("Exporter", func() {
10676
ctx = context.Background()
10777

10878
// Run the collector container
109-
110-
image, err := getCollectorImageFromDockerfile()
111-
Expect(err).ToNot(HaveOccurred())
79+
// renovate: datasource=docker
80+
image := "otel/opentelemetry-collector-contrib:0.106.1"
11281

11382
const collectorCfgName = "collector.yaml"
11483

@@ -131,11 +100,12 @@ var _ = Describe("Exporter", func() {
131100
Cmd: []string{"--config=/" + collectorCfgName},
132101
}
133102

134-
collector, err = testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
103+
var errCollector error
104+
collector, errCollector = testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
135105
ContainerRequest: req,
136106
Started: true,
137107
})
138-
Expect(err).ToNot(HaveOccurred())
108+
Expect(errCollector).ToNot(HaveOccurred())
139109

140110
// Create the exporter
141111

0 commit comments

Comments
 (0)