Rebase

Created using spr 1.3.4

.github/buildomat/config.toml

@@ -17,5 +17,6 @@ org_only = true
 allow_users = [
 	"dependabot[bot]",
 	"oxide-reflector-bot[bot]",
+	"oxide-renovate[bot]",
 	"renovate[bot]",
 ]

.github/workflows/check-opte-ver.yml

@@ -9,7 +9,7 @@ jobs:
   check-opte-ver:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
       - name: Install jq
         run: sudo apt-get install -y jq
       - name: Install toml-cli

.github/workflows/check-workspace-deps.yml

@@ -10,6 +10,6 @@ jobs:
   check-workspace-deps:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
       - name: Check Workspace Dependencies
         run: cargo xtask check-workspace-deps

.github/workflows/hakari.yml

@@ -17,21 +17,21 @@ jobs:
     env:
       RUSTFLAGS: -D warnings
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@v2
+        uses: taiki-e/install-action@e659bf85ee986e37e35cc1c53bfeebe044d8133e # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date
-        uses: actions-rs/cargo@v1
+        uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
         with:
           command: hakari
           args: generate --diff
       - name: Check all crates depend on workspace-hack
-        uses: actions-rs/cargo@v1
+        uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
         with:
           command: hakari
           args: manage-deps --dry-run

.github/workflows/rust.yml

@@ -9,7 +9,7 @@ jobs:
   check-style:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/[email protected]
+    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
     - name: Report cargo version
       run: cargo --version
     - name: Report rustfmt version
@@ -27,8 +27,8 @@ jobs:
     # This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
     - name: Disable packages.microsoft.com repo
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-    - uses: actions/[email protected]
-    - uses: Swatinem/[email protected]
+    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+    - uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
       if: ${{ github.ref != 'refs/heads/main' }}
     - name: Report cargo version
       run: cargo --version
@@ -53,8 +53,8 @@ jobs:
     # This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
     - name: Disable packages.microsoft.com repo
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-    - uses: actions/[email protected]
-    - uses: Swatinem/[email protected]
+    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+    - uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
       if: ${{ github.ref != 'refs/heads/main' }}
     - name: Report cargo version
       run: cargo --version
@@ -79,8 +79,8 @@ jobs:
     # This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
     - name: Disable packages.microsoft.com repo
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-    - uses: actions/[email protected]
-    - uses: Swatinem/[email protected]
+    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+    - uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
       if: ${{ github.ref != 'refs/heads/main' }}
     - name: Report cargo version
       run: cargo --version

.github/workflows/update-dendrite.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
 
       # Checkout both the target and integration branches
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
         with:
           token: ${{ inputs.reflector_access_token }}
           fetch-depth: 0

.github/workflows/update-maghemite.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
 
       # Checkout both the target and integration branches
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
         with:
           token: ${{ inputs.reflector_access_token }}
           fetch-depth: 0

.github/workflows/validate-openapi-spec.yml

@@ -10,8 +10,8 @@ jobs:
   format:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/[email protected]
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version: '18'
       - name: Install our tools

Cargo.toml

@@ -136,7 +136,7 @@ api_identity = { path = "api_identity" }
 approx = "0.5.1"
 assert_matches = "1.5.0"
 assert_cmd = "2.0.12"
-async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "da04c087f835a51e0441addb19c5ef4986e1fcf2" }
+async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "1446f7e0c1f05f33a0581abd51fa873c7652ab61" }
 async-trait = "0.1.73"
 atomicwrites = "0.4.1"
 authz-macros = { path = "nexus/authz-macros" }
@@ -199,6 +199,7 @@ headers = "0.3.9"
 heck = "0.4"
 hex = "0.4.3"
 hex-literal = "0.4.1"
+highway = "1.1.0"
 hkdf = "0.12.3"
 http = "0.2.9"
 httptest = "0.15.4"
@@ -274,7 +275,7 @@ percent-encoding = "2.2.0"
 pem = "1.1"
 petgraph = "0.6.4"
 postgres-protocol = "0.6.6"
-predicates = "3.0.3"
+predicates = "3.0.4"
 pretty_assertions = "1.4.0"
 pretty-hex = "0.3.0"
 proc-macro2 = "1.0"
@@ -283,7 +284,7 @@ progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branc
 bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e" }
 propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e", features = [ "generated-migration" ] }
 propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e", default-features = false, features = ["mock-only"] }
-proptest = "1.2.0"
+proptest = "1.3.1"
 quote = "1.0"
 rand = "0.8.5"
 ratatui = "0.23.0"

clients/nexus-client/src/lib.rs

@@ -88,22 +88,41 @@ impl From<omicron_common::api::internal::nexus::InstanceRuntimeState>
         s: omicron_common::api::internal::nexus::InstanceRuntimeState,
     ) -> Self {
         Self {
-            run_state: s.run_state.into(),
-            sled_id: s.sled_id,
-            propolis_id: s.propolis_id,
             dst_propolis_id: s.dst_propolis_id,
-            propolis_addr: s.propolis_addr.map(|addr| addr.to_string()),
+            gen: s.gen.into(),
             migration_id: s.migration_id,
-            propolis_gen: s.propolis_gen.into(),
-            ncpus: s.ncpus.into(),
-            memory: s.memory.into(),
-            hostname: s.hostname,
+            propolis_id: s.propolis_id,
+            time_updated: s.time_updated,
+        }
+    }
+}
+
+impl From<omicron_common::api::internal::nexus::VmmRuntimeState>
+    for types::VmmRuntimeState
+{
+    fn from(s: omicron_common::api::internal::nexus::VmmRuntimeState) -> Self {
+        Self {
             gen: s.gen.into(),
+            state: s.state.into(),
             time_updated: s.time_updated,
         }
     }
 }
 
+impl From<omicron_common::api::internal::nexus::SledInstanceState>
+    for types::SledInstanceState
+{
+    fn from(
+        s: omicron_common::api::internal::nexus::SledInstanceState,
+    ) -> Self {
+        Self {
+            instance_state: s.instance_state.into(),
+            propolis_id: s.propolis_id,
+            vmm_state: s.vmm_state.into(),
+        }
+    }
+}
+
 impl From<omicron_common::api::external::InstanceState>
     for types::InstanceState
 {
@@ -124,14 +143,6 @@ impl From<omicron_common::api::external::InstanceState>
     }
 }
 
-impl From<omicron_common::api::external::InstanceCpuCount>
-    for types::InstanceCpuCount
-{
-    fn from(s: omicron_common::api::external::InstanceCpuCount) -> Self {
-        Self(s.0)
-    }
-}
-
 impl From<omicron_common::api::external::Generation> for types::Generation {
     fn from(s: omicron_common::api::external::Generation) -> Self {
         Self(i64::from(&s) as u64)