Skip to content

[meta] update client crates to conform to RFD 619 #9565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunshowers wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[meta] update client crates to conform to RFD 619 #9565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/clickhouse-admin-keeper-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition.workspace = true

[dependencies]
chrono.workspace = true
clickhouse-admin-types.workspace = true
clickhouse-admin-types-versions.workspace = true
omicron-uuid-kinds.workspace = true
progenitor.workspace = true
reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
Expand Down
6 changes: 3 additions & 3 deletions clients/clickhouse-admin-keeper-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ progenitor::generate_api!(
},
derives = [schemars::JsonSchema],
replace = {
KeeperConfigurableSettings = clickhouse_admin_types::keeper::KeeperConfigurableSettings,
ClickhouseKeeperClusterMembership = clickhouse_admin_types::keeper::ClickhouseKeeperClusterMembership,
KeeperId = clickhouse_admin_types::keeper::KeeperId,
KeeperConfigurableSettings = clickhouse_admin_types_versions::latest::keeper::KeeperConfigurableSettings,
ClickhouseKeeperClusterMembership = clickhouse_admin_types_versions::latest::keeper::ClickhouseKeeperClusterMembership,
KeeperId = clickhouse_admin_types_versions::latest::keeper::KeeperId,
}
);
2 changes: 1 addition & 1 deletion clients/clickhouse-admin-server-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition.workspace = true

[dependencies]
chrono.workspace = true
clickhouse-admin-types.workspace = true
clickhouse-admin-types-versions.workspace = true
omicron-uuid-kinds.workspace = true
progenitor.workspace = true
reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
Expand Down
2 changes: 1 addition & 1 deletion clients/clickhouse-admin-server-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ progenitor::generate_api!(
},
derives = [schemars::JsonSchema],
replace = {
ServerConfigurableSettings = clickhouse_admin_types::server::ServerConfigurableSettings,
ServerConfigurableSettings = clickhouse_admin_types_versions::latest::server::ServerConfigurableSettings,
}
);
2 changes: 1 addition & 1 deletion clients/clickhouse-admin-single-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition.workspace = true

[dependencies]
chrono.workspace = true
clickhouse-admin-types.workspace = true
clickhouse-admin-types-versions.workspace = true
omicron-uuid-kinds.workspace = true
progenitor.workspace = true
reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
Expand Down
2 changes: 1 addition & 1 deletion clients/clickhouse-admin-single-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ progenitor::generate_api!(
},
derives = [schemars::JsonSchema],
replace = {
ServerConfigurableSettings = clickhouse_admin_types::server::ServerConfigurableSettings,
ServerConfigurableSettings = clickhouse_admin_types_versions::latest::server::ServerConfigurableSettings,
}
);
2 changes: 1 addition & 1 deletion clients/gateway-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ chrono.workspace = true
daft.workspace = true
ereport-types.workspace = true
gateway-messages.workspace = true
gateway-types.workspace = true
gateway-types-versions.workspace = true
omicron-uuid-kinds.workspace = true
progenitor.workspace = true
rand.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions clients/gateway-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ progenitor::generate_api!(
},

replace = {
RotSlot = gateway_types::rot::RotSlot,
RotSlot = gateway_types_versions::latest::rot::RotSlot,
Ena = ereport_types::Ena,
Ereport = ereport_types::Ereport,
Ereports = ereport_types::Ereports,
SpType = gateway_types::component::SpType,
TaskDump = gateway_types::task_dump::TaskDump,
SpType = gateway_types_versions::latest::component::SpType,
TaskDump = gateway_types_versions::latest::task_dump::TaskDump,
},
);

Expand Down Expand Up @@ -131,7 +131,7 @@ impl Client {
/// handful of seconds on real hardware.
pub async fn host_phase_1_flash_hash_calculate_with_timeout(
&self,
sp_type: gateway_types::component::SpType,
sp_type: gateway_types_versions::latest::component::SpType,
sp_slot: u16,
phase1_slot: u16,
timeout: Duration,
Expand Down
2 changes: 1 addition & 1 deletion clients/nexus-lockstep-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ workspace = true
chrono.workspace = true
futures.workspace = true
iddqd.workspace = true
sled-agent-types-versions.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-passwords.workspace = true
Expand All @@ -24,5 +23,6 @@ reqwest.workspace = true
schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
sled-agent-types-versions.workspace = true
slog.workspace = true
uuid.workspace = true
3 changes: 1 addition & 2 deletions clients/sled-agent-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ workspace = true
anyhow.workspace = true
async-trait.workspace = true
chrono.workspace = true
sled-agent-types-versions.workspace = true
omicron-common.workspace = true
omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
Expand All @@ -23,6 +22,6 @@ reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
sled-agent-types.workspace = true
sled-agent-types-versions.workspace = true
slog.workspace = true
uuid.workspace = true
Loading