Skip to content

Commit 00679b8

Browse files
authored
Group Dependabot security updates and keep v3-3-test covered (#70556)
* Group Dependabot security updates Dependabot groups only apply to security updates when they declare `applies-to: security-updates`; without it a group covers version updates only. Every group in our config relied on that default, so alert-driven bumps bypassed grouping entirely and opened one PR each - axios in edge3 (#70145), mermaid (#69132, #69137), gitpython (#70428), zeep (#68780), @hey-api/openapi-ts (#69265) and the two /go-sdk Go bumps (#70226, #69214). Add a `security-updates` group to every entry that targets the default branch. Entries carrying `target-branch: v3-3-test` are deliberately left alone: Dependabot raises security updates against the default branch only, so a security group there would never match. Comments note this so it does not look like an oversight. The three existing `*-major-version-updates` groups were already `applies-to: security-updates` but restricted to `update-types: [major]`, so minor and patch security fixes fell through ungrouped. They are widened to cover all security updates and renamed to `*-security-updates` to match what they actually do. Also adds a `gomod` entry for /go-sdk, which had no configuration at all - its Go security bumps were arriving individually because Dependabot raises security updates for ecosystems with no entry, but can only group them when one exists. Generated-by: Claude Opus 5 (1M context) * Mirror remaining dependency directories onto v3-3-test Dependabot raises security updates against the default branch only, so a fix that lands on main does not reach a maintenance branch by itself. Cherry-picking one over is unreliable: these commits carry lock file diffs, and main's lock files have long diverged from v3-3-test's, so the pick conflicts more often than not. Letting Dependabot maintain the branch directly avoids that entirely - it resolves the dependency and regenerates the lock file on v3-3-test itself. Six directories were tracked on main but not on the maintenance branch, so a fixed version had no way of reaching it: - npm: edge3 www, fab www, /registry, react plugin template - uv: /dev/breeze - gomod: /go-sdk They now have `target-branch: v3-3-test` entries following the policy the branch already uses for core-ui and auth-ui: minor and patch only, majors ignored. A fix that needs a major bump still has to be backported by hand. `dev/update_github_branch_config.py` generates the same six entries, so cutting the next release branch does not silently reintroduce the gap. Generated-by: Claude Opus 5 (1M context)
1 parent 4b84899 commit 00679b8

2 files changed

Lines changed: 281 additions & 9 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 164 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
# specific language governing permissions and limitations
1616
# under the License
1717
---
18+
# NOTE: a group applies to version updates unless it declares `applies-to: security-updates`.
19+
# Every entry below that targets the default branch therefore carries a matching
20+
# `*-security-updates` group, so alert-driven bumps arrive batched instead of one PR per
21+
# dependency. Entries using `target-branch` deliberately have no such group - Dependabot raises
22+
# security updates against the default branch only, so it would never match anything there.
1823
version: 2
1924
updates:
2025
- package-ecosystem: "github-actions"
@@ -28,6 +33,10 @@ updates:
2833
github-actions-updates:
2934
patterns:
3035
- "*"
36+
github-actions-security-updates:
37+
applies-to: security-updates
38+
patterns:
39+
- "*"
3140

3241
- package-ecosystem: "github-actions"
3342
directory: "/"
@@ -61,6 +70,10 @@ updates:
6170
pip-dependency-updates:
6271
patterns:
6372
- "*"
73+
pip-security-updates:
74+
applies-to: security-updates
75+
patterns:
76+
- "*"
6477

6578
- package-ecosystem: npm
6679
cooldown:
@@ -96,12 +109,10 @@ updates:
96109
update-types:
97110
- "minor"
98111
- "patch"
99-
core-ui-major-version-updates:
112+
core-ui-security-updates:
100113
patterns:
101114
- "*"
102115
applies-to: security-updates
103-
update-types:
104-
- "major"
105116

106117
- package-ecosystem: npm
107118
cooldown:
@@ -117,12 +128,10 @@ updates:
117128
update-types:
118129
- "minor"
119130
- "patch"
120-
auth-ui-major-version-updates:
131+
auth-ui-security-updates:
121132
patterns:
122133
- "*"
123134
applies-to: security-updates
124-
update-types:
125-
- "major"
126135

127136
- package-ecosystem: npm
128137
cooldown:
@@ -138,6 +147,10 @@ updates:
138147
update-types:
139148
- "minor"
140149
- "patch"
150+
ui-plugin-template-security-updates:
151+
patterns:
152+
- "*"
153+
applies-to: security-updates
141154
ignore:
142155
- dependency-name: "*"
143156
update-types: ["version-update:semver-major"]
@@ -153,6 +166,10 @@ updates:
153166
edge-ui-package-updates:
154167
patterns:
155168
- "*"
169+
edge-ui-security-updates:
170+
patterns:
171+
- "*"
172+
applies-to: security-updates
156173

157174
- package-ecosystem: npm
158175
cooldown:
@@ -165,6 +182,10 @@ updates:
165182
fab-ui-package-updates:
166183
patterns:
167184
- "*"
185+
fab-ui-security-updates:
186+
patterns:
187+
- "*"
188+
applies-to: security-updates
168189

169190
- package-ecosystem: npm
170191
cooldown:
@@ -180,12 +201,10 @@ updates:
180201
update-types:
181202
- "minor"
182203
- "patch"
183-
registry-major-version-updates:
204+
registry-security-updates:
184205
patterns:
185206
- "*"
186207
applies-to: security-updates
187-
update-types:
188-
- "major"
189208

190209
# Repeat dependency updates on v3-3-test branch as well
191210
- package-ecosystem: pip
@@ -247,6 +266,123 @@ updates:
247266
- dependency-name: "*"
248267
update-types: ["version-update:semver-major"]
249268

269+
# The remaining directories are mirrored onto v3-3-test as well. Dependabot raises security
270+
# updates against the default branch only, so a fixed version reaches the maintenance branch
271+
# through its own version updates - Dependabot resolves and regenerates the lock file on that
272+
# branch, which a cherry-picked lock file diff from main cannot do. Majors stay ignored, so a
273+
# fix that needs a major bump still has to be backported by hand.
274+
- package-ecosystem: npm
275+
cooldown:
276+
default-days: 4
277+
directories:
278+
- /providers/edge3/src/airflow/providers/edge3/plugins/www
279+
schedule:
280+
interval: "weekly"
281+
target-branch: v3-3-test
282+
groups:
283+
3-3-edge-ui-package-updates:
284+
patterns:
285+
- "*"
286+
update-types:
287+
- "minor"
288+
- "patch"
289+
ignore:
290+
- dependency-name: "*"
291+
update-types: ["version-update:semver-major"]
292+
293+
- package-ecosystem: npm
294+
cooldown:
295+
default-days: 4
296+
directories:
297+
- /providers/fab/src/airflow/providers/fab/www
298+
schedule:
299+
interval: daily
300+
target-branch: v3-3-test
301+
groups:
302+
3-3-fab-ui-package-updates:
303+
patterns:
304+
- "*"
305+
update-types:
306+
- "minor"
307+
- "patch"
308+
ignore:
309+
- dependency-name: "*"
310+
update-types: ["version-update:semver-major"]
311+
312+
- package-ecosystem: npm
313+
cooldown:
314+
default-days: 4
315+
directories:
316+
- /registry
317+
schedule:
318+
interval: "weekly"
319+
target-branch: v3-3-test
320+
groups:
321+
3-3-registry-package-updates:
322+
patterns:
323+
- "*"
324+
update-types:
325+
- "minor"
326+
- "patch"
327+
ignore:
328+
- dependency-name: "*"
329+
update-types: ["version-update:semver-major"]
330+
331+
- package-ecosystem: npm
332+
cooldown:
333+
default-days: 4
334+
directories:
335+
- /dev/react-plugin-tools/react_plugin_template
336+
schedule:
337+
interval: "weekly"
338+
target-branch: v3-3-test
339+
groups:
340+
3-3-ui-plugin-template-package-updates:
341+
patterns:
342+
- "*"
343+
update-types:
344+
- "minor"
345+
- "patch"
346+
ignore:
347+
- dependency-name: "*"
348+
update-types: ["version-update:semver-major"]
349+
350+
- package-ecosystem: "uv"
351+
cooldown:
352+
default-days: 4
353+
directory: "/dev/breeze"
354+
schedule:
355+
interval: "weekly"
356+
target-branch: v3-3-test
357+
groups:
358+
3-3-uv-dependency-updates:
359+
patterns:
360+
- "*"
361+
update-types:
362+
- "minor"
363+
- "patch"
364+
ignore:
365+
- dependency-name: "*"
366+
update-types: ["version-update:semver-major"]
367+
368+
- package-ecosystem: "gomod"
369+
cooldown:
370+
default-days: 4
371+
directory: "/go-sdk"
372+
schedule:
373+
interval: "weekly"
374+
target-branch: v3-3-test
375+
groups:
376+
3-3-go-sdk-dependency-updates:
377+
patterns:
378+
- "*"
379+
update-types:
380+
- "minor"
381+
- "patch"
382+
ignore:
383+
- dependency-name: "*"
384+
update-types: ["version-update:semver-major"]
385+
250386
- package-ecosystem: "uv"
251387
cooldown:
252388
default-days: 4
@@ -257,3 +393,22 @@ updates:
257393
uv-dependency-updates:
258394
patterns:
259395
- "*"
396+
uv-security-updates:
397+
patterns:
398+
- "*"
399+
applies-to: security-updates
400+
401+
- package-ecosystem: "gomod"
402+
cooldown:
403+
default-days: 4
404+
directory: "/go-sdk"
405+
schedule:
406+
interval: "weekly"
407+
groups:
408+
go-sdk-dependency-updates:
409+
patterns:
410+
- "*"
411+
go-sdk-security-updates:
412+
patterns:
413+
- "*"
414+
applies-to: security-updates

‎dev/update_github_branch_config.py‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,123 @@ def update_dependabot(new_branch: str, prev_branch: str, new_dash: str) -> None:
156156
- dependency-name: "*"
157157
update-types: ["version-update:semver-major"]
158158
159+
# The remaining directories are mirrored onto {new_branch} as well. Dependabot raises security
160+
# updates against the default branch only, so a fixed version reaches the maintenance branch
161+
# through its own version updates - Dependabot resolves and regenerates the lock file on that
162+
# branch, which a cherry-picked lock file diff from main cannot do. Majors stay ignored, so a
163+
# fix that needs a major bump still has to be backported by hand.
164+
- package-ecosystem: npm
165+
cooldown:
166+
default-days: 4
167+
directories:
168+
- /providers/edge3/src/airflow/providers/edge3/plugins/www
169+
schedule:
170+
interval: "weekly"
171+
target-branch: {new_branch}
172+
groups:
173+
{new_dash}-edge-ui-package-updates:
174+
patterns:
175+
- "*"
176+
update-types:
177+
- "minor"
178+
- "patch"
179+
ignore:
180+
- dependency-name: "*"
181+
update-types: ["version-update:semver-major"]
182+
183+
- package-ecosystem: npm
184+
cooldown:
185+
default-days: 4
186+
directories:
187+
- /providers/fab/src/airflow/providers/fab/www
188+
schedule:
189+
interval: daily
190+
target-branch: {new_branch}
191+
groups:
192+
{new_dash}-fab-ui-package-updates:
193+
patterns:
194+
- "*"
195+
update-types:
196+
- "minor"
197+
- "patch"
198+
ignore:
199+
- dependency-name: "*"
200+
update-types: ["version-update:semver-major"]
201+
202+
- package-ecosystem: npm
203+
cooldown:
204+
default-days: 4
205+
directories:
206+
- /registry
207+
schedule:
208+
interval: "weekly"
209+
target-branch: {new_branch}
210+
groups:
211+
{new_dash}-registry-package-updates:
212+
patterns:
213+
- "*"
214+
update-types:
215+
- "minor"
216+
- "patch"
217+
ignore:
218+
- dependency-name: "*"
219+
update-types: ["version-update:semver-major"]
220+
221+
- package-ecosystem: npm
222+
cooldown:
223+
default-days: 4
224+
directories:
225+
- /dev/react-plugin-tools/react_plugin_template
226+
schedule:
227+
interval: "weekly"
228+
target-branch: {new_branch}
229+
groups:
230+
{new_dash}-ui-plugin-template-package-updates:
231+
patterns:
232+
- "*"
233+
update-types:
234+
- "minor"
235+
- "patch"
236+
ignore:
237+
- dependency-name: "*"
238+
update-types: ["version-update:semver-major"]
239+
240+
- package-ecosystem: "uv"
241+
cooldown:
242+
default-days: 4
243+
directory: "/dev/breeze"
244+
schedule:
245+
interval: "weekly"
246+
target-branch: {new_branch}
247+
groups:
248+
{new_dash}-uv-dependency-updates:
249+
patterns:
250+
- "*"
251+
update-types:
252+
- "minor"
253+
- "patch"
254+
ignore:
255+
- dependency-name: "*"
256+
update-types: ["version-update:semver-major"]
257+
258+
- package-ecosystem: "gomod"
259+
cooldown:
260+
default-days: 4
261+
directory: "/go-sdk"
262+
schedule:
263+
interval: "weekly"
264+
target-branch: {new_branch}
265+
groups:
266+
{new_dash}-go-sdk-dependency-updates:
267+
patterns:
268+
- "*"
269+
update-types:
270+
- "minor"
271+
- "patch"
272+
ignore:
273+
- dependency-name: "*"
274+
update-types: ["version-update:semver-major"]
275+
159276
"""
160277
prev_comment = f" # Repeat dependency updates on {prev_branch} branch as well"
161278
content = content.replace(prev_comment, pip_npm_block + prev_comment, 1)

0 commit comments

Comments
 (0)