Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
37 changes: 37 additions & 0 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ members = [
"dev-tools/pins",
"dev-tools/reconfigurator-cli",
"dev-tools/reconfigurator-exec-unsafe",
"dev-tools/reconfigurator-sp-updater",
"dev-tools/releng",
"dev-tools/repl-utils",
"dev-tools/repo-depot-standalone",
Expand Down Expand Up @@ -188,6 +189,7 @@ default-members = [
"dev-tools/pins",
"dev-tools/reconfigurator-cli",
"dev-tools/reconfigurator-exec-unsafe",
"dev-tools/reconfigurator-sp-updater",
"dev-tools/releng",
"dev-tools/repl-utils",
"dev-tools/repo-depot-standalone",
Expand Down Expand Up @@ -688,7 +690,7 @@ tokio = "1.43.0"
tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
tokio-stream = "0.1.17"
tokio-tungstenite = "0.23.1"
tokio-util = { version = "0.7.13", features = ["io", "io-util"] }
tokio-util = { version = "0.7.13", features = ["io", "io-util", "time"] }
toml = "0.8.20"
toml_edit = "0.22.24"
tough = { version = "0.20.0", features = [ "http" ] }
Expand Down
1 change: 1 addition & 0 deletions clients/gateway-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ workspace = true
[dependencies]
base64.workspace = true
chrono.workspace = true
daft.workspace = true
gateway-messages.workspace = true
progenitor.workspace = true
rand.workspace = true
Expand Down
3 changes: 3 additions & 0 deletions clients/gateway-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ progenitor::generate_api!(
SpIgnition = { derives = [PartialEq, Eq, PartialOrd, Ord] },
SpIgnitionSystemType = { derives = [Copy, PartialEq, Eq, PartialOrd, Ord] },
SpState = { derives = [PartialEq, Eq, PartialOrd, Ord] },
SpType = { derives = [daft::Diffable] },
SpUpdateStatus = { derives = [PartialEq, Hash, Eq] },
UpdatePreparationProgress = { derives = [PartialEq, Hash, Eq] },
},
);

Expand Down
2 changes: 2 additions & 0 deletions common/src/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use std::fmt;

use daft::Diffable;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use tufaceous_artifact::{Artifact, ArtifactKind, ArtifactVersion};
Expand All @@ -15,6 +16,7 @@ use tufaceous_artifact::{Artifact, ArtifactKind, ArtifactVersion};
// TODO: move this to tufaceous-artifact in the future
#[derive(
Debug,
Diffable,
Clone,
PartialEq,
Eq,
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/omdb/tests/successes.out
Original file line number Diff line number Diff line change
Expand Up @@ -1423,6 +1423,7 @@ parent: <none>
internal DNS version: 1
external DNS version: 2

PENDING MGS-MANAGED UPDATES: 0

---------------------------------------------
stderr:
Expand Down Expand Up @@ -1519,6 +1520,7 @@ parent: <none>
internal DNS version: 1
external DNS version: 2

PENDING MGS-MANAGED UPDATES: 0

---------------------------------------------
stderr:
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


>
Expand Down Expand Up @@ -453,5 +454,6 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 9995de32-dd52-4eb1-b0eb-141eb84bc739
Expand Down Expand Up @@ -605,6 +606,7 @@ parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-plan 366b0b68-d80e-4bc1-abd3-dc69837847e0
Expand Down Expand Up @@ -922,6 +924,7 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone d786ef4a-5acb-4f5d-a732-a00addf986b5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ parent: 1b013011-2062-4b48-b544-a32b23bce83a
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


>
Expand Down Expand Up @@ -198,6 +199,7 @@ parent: 9766ca20-38d4-4380-b005-e7c43c797e7c
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-diff 971eeb12-1830-4fa0-a699-98ea0164505c f714e6ea-e85a-4d7d-93c2-a018744fe176
Expand Down Expand Up @@ -470,6 +472,7 @@ parent: bb128f06-a2e1-44c1-8874-4f789d0ff896
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-diff f714e6ea-e85a-4d7d-93c2-a018744fe176 d9c572a1-a68c-4945-b1ec-5389bd588fe9
Expand Down
32 changes: 32 additions & 0 deletions dev-tools/reconfigurator-sp-updater/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[package]
name = "reconfigurator-sp-updater"
version = "0.1.0"
edition = "2021"
license = "MPL-2.0"

[lints]
workspace = true

[dependencies]
anyhow.workspace = true
clap.workspace = true
chrono.workspace = true
dropshot.workspace = true
futures.workspace = true
gateway-client.workspace = true
humantime.workspace = true
internal-dns-resolver.workspace = true
internal-dns-types.workspace = true
nexus-mgs-updates.workspace = true
nexus-types.workspace = true
omicron-repl-utils.workspace = true
qorb.workspace = true
serde_json.workspace = true
slog.workspace = true
tokio = { workspace = true, features = [ "full" ] }
tufaceous-artifact.workspace = true
omicron-workspace-hack.workspace = true

[[bin]]
name = "reconfigurator-sp-updater"
path = "src/main.rs"
Loading
Loading