Skip to content

Commit eab2e66

Browse files
authored
openapi manager should support multiple documents for versioned APIs (#7564)
1 parent c1a48cd commit eab2e66

39 files changed

+5645
-1412
lines changed

Cargo.lock

Lines changed: 224 additions & 168 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ dns-server = { path = "dns-server" }
384384
dns-server-api = { path = "dns-server-api" }
385385
dns-service-client = { path = "clients/dns-service-client" }
386386
dpd-client = { path = "clients/dpd-client" }
387-
dropshot = { version = "0.15.1", features = [ "usdt-probes" ] }
387+
dropshot = { version = "0.16.0", features = [ "usdt-probes" ] }
388388
dyn-clone = "1.0.18"
389389
either = "1.14.0"
390390
expectorate = "1.1.0"
@@ -662,7 +662,7 @@ tempfile = "3.10"
662662
term = "0.7"
663663
termios = "0.3"
664664
termtree = "0.5.1"
665-
textwrap = "0.16.1"
665+
textwrap = { version = "0.16.1", features = [ "terminal_size" ] }
666666
test-strategy = "0.4.0"
667667
thiserror = "1.0"
668668
tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
@@ -868,6 +868,7 @@ opt-level = 3
868868
# [patch.crates-io]
869869
# diesel = { path = "../../diesel/diesel" }
870870
# dropshot = { path = "../dropshot/dropshot" }
871+
# dropshot_endpoint = { path = "../dropshot/dropshot_endpoint" }
871872
# progenitor = { path = "../progenitor/progenitor" }
872873
# progenitor-client = { path = "../progenitor/progenitor-client" }
873874
# steno = { path = "../steno" }

clients/dns-service-client/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
44

55
progenitor::generate_api!(
6-
spec = "../../openapi/dns-server.json",
6+
spec = "../../openapi/dns-server/dns-server-latest.json",
77
inner_type = slog::Logger,
88
derives = [schemars::JsonSchema, Clone, Eq, PartialEq],
99
pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {

dev-tools/openapi-manager/Cargo.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ camino.workspace = true
1515
clap.workspace = true
1616
clickhouse-admin-api.workspace = true
1717
cockroach-admin-api.workspace = true
18+
debug-ignore.workspace = true
1819
dns-server-api.workspace = true
1920
dropshot.workspace = true
21+
hex.workspace = true
2022
fs-err.workspace = true
2123
gateway-api.workspace = true
2224
indent_write.workspace = true
2325
installinator-api.workspace = true
26+
itertools.workspace = true
2427
nexus-external-api.workspace = true
2528
nexus-internal-api.workspace = true
29+
newtype_derive.workspace = true
2630
omicron-workspace-hack.workspace = true
2731
openapi-lint.workspace = true
2832
openapi-manager-types.workspace = true
@@ -32,7 +36,14 @@ oximeter-api.workspace = true
3236
repo-depot-api.workspace = true
3337
semver.workspace = true
3438
serde_json.workspace = true
39+
sha2.workspace = true
3540
similar.workspace = true
3641
sled-agent-api.workspace = true
42+
slog-error-chain.workspace = true
43+
textwrap.workspace = true
44+
thiserror.workspace = true
3745
supports-color.workspace = true
3846
wicketd-api.workspace = true
47+
48+
[dev-dependencies]
49+
assert_matches.workspace = true

dev-tools/openapi-manager/README.adoc

Lines changed: 212 additions & 3 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)