Commit a6cd5e7
authored
[CRCR] Move Buildkite repo mappings to ci_providers.yml (#8468)
## Summary
Moves Buildkite pipeline-to-repo identity mappings into
`ci_providers.yml` so adding new downstream repos only requires a config
change — no Lambda redeployment.
**Key security design decision**: OIDC trust anchors (issuer URLs, JWKS
endpoints) remain **compiled into** `jwt_helper.py`. They cannot be
overridden from the runtime-fetched config file. Only mutable
*authorization* data (which pipeline maps to which repo) is loaded from
config.
### What's in config (runtime-mutable)
- `providers.buildkite.repo_map` — pipeline-to-repo mappings with
optional `required_claims`
### What's compiled in (immutable without redeployment)
- GitHub issuer URL + JWKS endpoint
- Buildkite issuer URL + JWKS endpoint
- Repo extractor functions per provider
### Deploy ordering
The legacy flat `buildkite:` section is still supported as a fallback —
if the `providers` section has no `repo_map`, the loader falls back to
the flat section. This means old code + new config still works.
### Adding a new downstream repo
1. Add entry to `providers.buildkite.repo_map` in `ci_providers.yml`
2. No Lambda redeployment needed
### Adding a new CI provider
1. Add issuer/JWKS constants and `_extract_repo_<provider>` function in
`jwt_helper.py`
2. Deploy Lambda
3. Add `repo_map` entries to config
| File | What |
| --- | --- |
| `config/ci_providers.yml` | Buildkite repo_map only (issuer/JWKS
removed) |
| `utils/jwt_helper.py` | Trust anchors compiled in; config loads only
repo maps |
| `tests/test_jwt_helper.py` | Tests verify JWKS clients are not
expandable via config |
> **Depends on**: #8453
## Test plan
- All unit tests pass (including new `TestTrustAnchorsCompiledIn` class)
- CI passes (lintrunner, python-tests)
- Verify a rogue issuer in config does NOT create a JWKS client
- Verify backward compat with legacy flat config format1 parent 304ebf2 commit a6cd5e7
3 files changed
Lines changed: 200 additions & 108 deletions
File tree
- aws/lambda/cross_repo_ci_relay
- config
- tests
- utils
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
8 | 10 | | |
9 | 11 | | |
10 | 12 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | 13 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
| 14 | + | |
30 | 15 | | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
38 | 39 | | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 40 | + | |
| 41 | + | |
44 | 42 | | |
45 | 43 | | |
46 | 44 | | |
47 | 45 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
259 | 260 | | |
260 | 261 | | |
261 | 262 | | |
262 | | - | |
| 263 | + | |
263 | 264 | | |
264 | 265 | | |
265 | 266 | | |
| |||
275 | 276 | | |
276 | 277 | | |
277 | 278 | | |
278 | | - | |
| 279 | + | |
279 | 280 | | |
280 | 281 | | |
281 | 282 | | |
| |||
293 | 294 | | |
294 | 295 | | |
295 | 296 | | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
296 | 350 | | |
297 | 351 | | |
298 | 352 | | |
| |||
317 | 371 | | |
318 | 372 | | |
319 | 373 | | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
320 | 386 | | |
321 | 387 | | |
322 | 388 | | |
| |||
342 | 408 | | |
343 | 409 | | |
344 | 410 | | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
345 | 434 | | |
346 | 435 | | |
0 commit comments