Commit caa7208
committed
Merge main into dev: refresh the committed spec to 1.5.3 from core, not by hand
main and dev diverged: main was 3 commits ahead (the v0.2.3 openapi.json
refresh to busbar 1.5.3, defining admin-tokens under identity-providers
as 1.5.3 requires, and a release fix so a partial build cannot publish a
release missing platforms), dev 5.
Releases are cut from main, so nothing shipped was at risk. The hazard
was the next dev -> main pull request silently reverting main's fixes.
One conflict, openapi.json, seventeen hunks. Not hand-merged. This file
is a committed COPY of core's admin spec, which ci.yml checks against
crates/busbar/src/admin/v1/json/openapi.json in the paired core
checkout, so the resolution is to take it from the generator rather than
to reconcile hunks. main's copy is v1.5.3 and compares structurally
identical to that file in busbar 1.5.3
(c8780349cf66d09b891478d50766b89dc1ff224c); dev's was still v1.5.2.
Took main's, then re-verified the committed result against the core
1.5.3 spec directly.
scripts/integration.sh merged without conflict and is worth naming,
because the result is dev's and that is the right outcome: dev's version
probes the engine for which admin-auth grammar it accepts instead of
assuming one, carrying main's 1.5.3 identity-providers form verbatim as
the modern branch and falling back to the legacy inline form only on the
exact "unknown field identity-providers" rejection. dev's CI runs this
against a released engine as well as the paired one, which main's
single-grammar version could not survive. main's fix is preserved, not
dropped.
Confirmed after resolving that release.yml, Cargo.toml, Cargo.lock and
openapi.json all match main exactly.
Gate: cargo fmt --all --check, cargo clippy --all-targets -D warnings
and cargo check --tests all pass. The integration script itself needs a
real gateway and was not executed here.
Noted, not changed, as it is main's pre-existing state and outside this
merge: README.md still describes the committed contract as busbar 1.5.2
in two places, though openapi.json is now 1.5.3 on both main and here.5 files changed
Lines changed: 235 additions & 166 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
5 | 16 | | |
6 | 17 | | |
7 | 18 | | |
| |||
10 | 21 | | |
11 | 22 | | |
12 | 23 | | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
13 | 30 | | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
14 | 49 | | |
| 50 | + | |
15 | 51 | | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
16 | 56 | | |
17 | 57 | | |
18 | 58 | | |
| |||
34 | 74 | | |
35 | 75 | | |
36 | 76 | | |
37 | | - | |
38 | | - | |
39 | | - | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
0 commit comments