Skip to content

Commit 63f82ad

Browse files
zeitlingerzeitlinger
authored
chore: upgrade flint to v0.22.2 (#2109)
## What changed - upgraded the Flint runtime in `mise.toml` to `aqua:grafana/flint@0.22.2` - migrated obsolete tool declarations that Flint now rewrites automatically - replaced `codespell` with `typos` - refreshed `.github/renovate-tracked-deps.json` - added targeted regex-based `_typos.toml` ignores for intentional tokens and fixture content ## Why This validates the Flint `v0.22.2` rollout on another consumer repo using the same migration policy: - no source-content rewrites to satisfy `typos` - use targeted regex ignores instead of broad word allowlists where practical - leave Renovate preset bumps to Renovate ## Validation - `mise run lint` ## Notes - `mise run test` failed in this checkout, but the failure appears unrelated to this Flint-only config change. The failing tests error on Java `Map.of(...)` compilation in existing test sources under `prometheus-metrics-config`.
1 parent b56927d commit 63f82ad

4 files changed

Lines changed: 162 additions & 150 deletions

File tree

‎.codespellrc‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/config/_typos.toml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[default]
2+
extend-ignore-re = [
3+
're-use',
4+
'\.atMost\(',
5+
'<id>errorprone</id>',
6+
'com\.google\.errorprone',
7+
'\bNormalDistribution nd\b',
8+
'\bnd\.inverseCumulativeProbability\(',
9+
'BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTI0MDUxMDE0MzY1NloYDzIxMjQw',
10+
]

‎.github/renovate-tracked-deps.json‎

Lines changed: 147 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,150 @@
11
{
2-
".github/renovate.json5": {
3-
"renovate-config-presets": [
4-
"grafana/flint"
5-
]
6-
},
7-
".github/workflows/acceptance-tests.yml": {
8-
"regex": [
9-
"mise"
10-
]
11-
},
12-
".github/workflows/build.yml": {
13-
"regex": [
14-
"mise"
15-
]
16-
},
17-
".github/workflows/generate-protobuf.yml": {
18-
"regex": [
19-
"mise"
20-
]
21-
},
22-
".github/workflows/github-pages.yaml": {
23-
"regex": [
24-
"mise"
25-
]
26-
},
27-
".github/workflows/java-version-matrix-tests.yml": {
28-
"regex": [
29-
"mise"
30-
]
31-
},
32-
".github/workflows/lint.yml": {
33-
"regex": [
34-
"mise"
35-
]
36-
},
37-
".github/workflows/native-tests.yml": {
38-
"regex": [
39-
"mise"
40-
]
41-
},
42-
".github/workflows/nightly-benchmarks.yml": {
43-
"regex": [
44-
"mise"
45-
]
46-
},
47-
".github/workflows/release.yml": {
48-
"regex": [
49-
"mise"
50-
]
51-
},
52-
".github/workflows/test-release-build.yml": {
53-
"regex": [
54-
"mise"
55-
]
56-
},
57-
".mise/envs/native/mise.toml": {
58-
"mise": [
59-
"java"
60-
]
61-
},
62-
".mvn/wrapper/maven-wrapper.properties": {
63-
"maven-wrapper": [
64-
"maven"
65-
]
66-
},
67-
"examples/example-custom-buckets/docker-compose.yaml": {
68-
"docker-compose": [
69-
"eclipse-temurin",
70-
"grafana/grafana",
71-
"prom/prometheus"
72-
]
73-
},
74-
"examples/example-exemplars-tail-sampling/docker-compose.yaml": {
75-
"docker-compose": [
76-
"grafana/grafana",
77-
"grafana/k6",
78-
"grafana/tempo",
79-
"opentelemetry-java-agent",
80-
"otel/opentelemetry-collector-contrib",
81-
"prom/prometheus"
82-
]
83-
},
84-
"examples/example-exporter-opentelemetry/docker-compose.yaml": {
85-
"docker-compose": [
86-
"openjdk",
87-
"otel/opentelemetry-collector-contrib",
88-
"prom/prometheus"
89-
]
90-
},
91-
"examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile": {
92-
"dockerfile": [
93-
"eclipse-temurin"
94-
]
95-
},
96-
"examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile": {
97-
"dockerfile": [
98-
"eclipse-temurin"
99-
]
100-
},
101-
"examples/example-native-histogram/docker-compose.yaml": {
102-
"docker-compose": [
103-
"eclipse-temurin",
104-
"grafana/grafana",
105-
"prom/prometheus"
106-
]
107-
},
108-
"mise.toml": {
109-
"mise": [
110-
"actionlint",
111-
"aqua:owenlamont/ryl",
112-
"biome",
113-
"editorconfig-checker",
114-
"github:google/google-java-format",
115-
"github:grafana/flint",
116-
"github:jonwiggins/xmloxide",
117-
"github:koalaman/shellcheck",
118-
"go:github.com/grafana/oats",
119-
"hugo",
120-
"java",
121-
"lychee",
122-
"node",
123-
"npm:renovate",
124-
"pipx:codespell",
125-
"protoc",
126-
"ruff",
127-
"rumdl",
128-
"shfmt",
129-
"taplo"
130-
]
131-
},
132-
"mvnw": {
133-
"maven-wrapper": [
134-
"maven-wrapper"
135-
]
136-
},
137-
"mvnw.cmd": {
138-
"maven-wrapper": [
139-
"maven-wrapper"
140-
]
2+
"meta": {
3+
"protoc": {
4+
"packageName": "protocolbuffers/protobuf",
5+
"datasource": "github-releases"
6+
}
7+
},
8+
"files": {
9+
".github/renovate.json5": {
10+
"renovate-config-presets": [
11+
"grafana/flint"
12+
]
13+
},
14+
".github/workflows/acceptance-tests.yml": {
15+
"regex": [
16+
"mise"
17+
]
18+
},
19+
".github/workflows/build.yml": {
20+
"regex": [
21+
"mise"
22+
]
23+
},
24+
".github/workflows/generate-protobuf.yml": {
25+
"regex": [
26+
"mise"
27+
]
28+
},
29+
".github/workflows/github-pages.yaml": {
30+
"regex": [
31+
"mise"
32+
]
33+
},
34+
".github/workflows/java-version-matrix-tests.yml": {
35+
"regex": [
36+
"mise"
37+
]
38+
},
39+
".github/workflows/lint.yml": {
40+
"regex": [
41+
"mise"
42+
]
43+
},
44+
".github/workflows/native-tests.yml": {
45+
"regex": [
46+
"mise"
47+
]
48+
},
49+
".github/workflows/nightly-benchmarks.yml": {
50+
"regex": [
51+
"mise"
52+
]
53+
},
54+
".github/workflows/release.yml": {
55+
"regex": [
56+
"mise"
57+
]
58+
},
59+
".github/workflows/test-release-build.yml": {
60+
"regex": [
61+
"mise"
62+
]
63+
},
64+
".mise/envs/native/mise.toml": {
65+
"mise": [
66+
"java"
67+
]
68+
},
69+
".mvn/wrapper/maven-wrapper.properties": {
70+
"maven-wrapper": [
71+
"maven"
72+
]
73+
},
74+
"examples/example-custom-buckets/docker-compose.yaml": {
75+
"docker-compose": [
76+
"eclipse-temurin",
77+
"grafana/grafana",
78+
"prom/prometheus"
79+
]
80+
},
81+
"examples/example-exemplars-tail-sampling/docker-compose.yaml": {
82+
"docker-compose": [
83+
"grafana/grafana",
84+
"grafana/k6",
85+
"grafana/tempo",
86+
"opentelemetry-java-agent",
87+
"otel/opentelemetry-collector-contrib",
88+
"prom/prometheus"
89+
]
90+
},
91+
"examples/example-exporter-opentelemetry/docker-compose.yaml": {
92+
"docker-compose": [
93+
"openjdk",
94+
"otel/opentelemetry-collector-contrib",
95+
"prom/prometheus"
96+
]
97+
},
98+
"examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile": {
99+
"dockerfile": [
100+
"eclipse-temurin"
101+
]
102+
},
103+
"examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile": {
104+
"dockerfile": [
105+
"eclipse-temurin"
106+
]
107+
},
108+
"examples/example-native-histogram/docker-compose.yaml": {
109+
"docker-compose": [
110+
"eclipse-temurin",
111+
"grafana/grafana",
112+
"prom/prometheus"
113+
]
114+
},
115+
"mise.toml": {
116+
"mise": [
117+
"actionlint",
118+
"aqua:grafana/flint",
119+
"aqua:jonwiggins/xmloxide",
120+
"aqua:owenlamont/ryl",
121+
"biome",
122+
"editorconfig-checker",
123+
"go:github.com/grafana/oats",
124+
"google-java-format",
125+
"hugo",
126+
"java",
127+
"lychee",
128+
"node",
129+
"npm:renovate",
130+
"protoc",
131+
"ruff",
132+
"rumdl",
133+
"shellcheck",
134+
"shfmt",
135+
"taplo",
136+
"typos"
137+
]
138+
},
139+
"mvnw": {
140+
"maven-wrapper": [
141+
"maven-wrapper"
142+
]
143+
},
144+
"mvnw.cmd": {
145+
"maven-wrapper": [
146+
"maven-wrapper"
147+
]
148+
}
141149
}
142150
}

‎mise.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ protoc = "34.1"
77

88
# Linters
99
actionlint = "1.7.12"
10+
"aqua:grafana/flint" = "0.22.2"
11+
"aqua:jonwiggins/xmloxide" = "v0.4.2"
1012
"aqua:owenlamont/ryl" = "0.8.0"
1113
biome = "2.4.12"
1214
editorconfig-checker = "v3.6.1"
13-
"github:google/google-java-format" = "1.35.0"
14-
"github:grafana/flint" = "0.21.0"
15-
"github:jonwiggins/xmloxide" = "v0.4.2"
16-
"github:koalaman/shellcheck" = "v0.11.0"
15+
google-java-format = "1.35.0"
1716
lychee = "0.24.2"
1817
"npm:renovate" = "43.144.0"
19-
"pipx:codespell" = "2.4.2"
2018
ruff = "0.15.12"
2119
rumdl = "0.1.84"
20+
shellcheck = "v0.11.0"
2221
shfmt = "3.13.1"
2322
taplo = "0.10.0"
23+
typos = "1.46.1"
2424

2525
[env]
2626
FLINT_CONFIG_DIR = ".github/config"

0 commit comments

Comments
 (0)