Commit be40598
committed
PMM-15360: Regenerate the server/v1 swagger and JSON client for om_enabled
make gen does more than buf generate -- it also regenerates the
swagger/OpenAPI JSON (api/server/v1/json/v1.json, the merged
api/swagger/swagger*.json) and the generated JSON API client
(api/server/v1/json/client/server_service/*.go) from the same proto.
The earlier commit only ran buf generate directly and hand-curated its
output against unrelated toolchain drift elsewhere in api/, which
missed these -- they're make gen's job, not buf generate's.
Also picks up the same protoc-gen-go import-grouping drift on
server.pb.go/server.pb.validate.go that affects unrelated proto
packages across the tree; taking make gen's own output here (rather my
earlier hand-curated one) is what actually matches what CI's own gen
step produces, so this and CI won't disagree again.
The generated client's field names are OmEnabled/EnableOm here,
matching this branch's own api/Makefile: --additional-initialism=om
was added to the swagger client generator's flag list by
PMM-15326-om-api, but that commit hasn't reached this branch's base
(PMM-15299-open-manager) yet, so "om" isn't a registered initialism
here and go-swagger capitalizes it as an ordinary word. Branches that
already have that flag (PMM-15326-om-backend and its descendants) will
correctly want OMEnabled/EnableOM instead -- each PR's generated code
has to match its own base's Makefile, not a single "right" answer
across the stack.
Found because CI's "make gen; git diff --exit-code" check failed on
this exact mismatch, on all three of this ticket's PRs.
Signed-off-by: Pawel Lebioda <pawel.lebioda@percona.com>1 parent e96b32d commit be40598
8 files changed
Lines changed: 158 additions & 58 deletions
File tree
- api
- server/v1
- json
- client/server_service
- swagger
Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
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 | |
|---|---|---|---|
| |||
311 | 311 | | |
312 | 312 | | |
313 | 313 | | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
314 | 319 | | |
315 | 320 | | |
316 | 321 | | |
| |||
488 | 493 | | |
489 | 494 | | |
490 | 495 | | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
491 | 502 | | |
492 | 503 | | |
493 | 504 | | |
| |||
629 | 640 | | |
630 | 641 | | |
631 | 642 | | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
632 | 648 | | |
633 | 649 | | |
634 | 650 | | |
| |||
729 | 745 | | |
730 | 746 | | |
731 | 747 | | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
732 | 753 | | |
733 | 754 | | |
734 | 755 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments