Merge branch 'main' into nexus-zone-filesystems-2

oxidecomputer · Jul 1, 2024 · d83a553 · d83a553
2 parents f0ab1c2 + 0f757cd
commit d83a553
Show file tree

Hide file tree

Showing 76 changed files with 2,332 additions and 1,277 deletions.
diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@3b0d937160738a7a458c7b13f8b05f08f3f72d80 # v2
+        uses: taiki-e/install-action@331a600f1b10a3fed8dc56f925012bede91ae51f # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -327,14 +327,14 @@ key-manager = { path = "key-manager" }
 kstat-rs = "0.2.4"
 libc = "0.2.155"
 libfalcon = { git = "https://github.com/oxidecomputer/falcon", rev = "e69694a1f7cc9fe31fab27f321017280531fb5f7" }
-libnvme = { git = "https://github.com/oxidecomputer/libnvme", rev = "6fffcc81d2c423ed2d2e6c5c2827485554c4ecbe" }
+libnvme = { git = "https://github.com/oxidecomputer/libnvme", rev = "dd5bb221d327a1bc9287961718c3c10d6bd37da0" }
 linear-map = "1.2.0"
 macaddr = { version = "1.0.1", features = ["serde_std"] }
 maplit = "1.0.2"
 mockall = "0.12"
 newtype_derive = "0.1.6"
-mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "3c3fa8482fe09a01da62fbd35efe124ea9cac9e7" }
-ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "3c3fa8482fe09a01da62fbd35efe124ea9cac9e7" }
+mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "6e0a232fd0b443c19f61f94bf02b7695505aa8e3" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "6e0a232fd0b443c19f61f94bf02b7695505aa8e3" }
 multimap = "0.10.0"
 nexus-auth = { path = "nexus/auth" }
 nexus-client = { path = "clients/nexus-client" }
@@ -437,7 +437,7 @@ schemars = "0.8.16"
 secrecy = "0.8.0"
 semver = { version = "1.0.23", features = ["std", "serde"] }
 serde = { version = "1.0", default-features = false, features = [ "derive", "rc" ] }
-serde_human_bytes = { git = "http://github.com/oxidecomputer/serde_human_bytes", branch = "main" }
+serde_human_bytes = { git = "https://github.com/oxidecomputer/serde_human_bytes", branch = "main" }
 serde_json = "1.0.117"
 serde_path_to_error = "0.1.16"
 serde_tokenstream = "0.2"
@@ -470,16 +470,16 @@ slog-term = "2.9.1"
 smf = "0.2"
 socket2 = { version = "0.5", features = ["all"] }
 sp-sim = { path = "sp-sim" }
-sprockets-common = { git = "http://github.com/oxidecomputer/sprockets", rev = "77df31efa5619d0767ffc837ef7468101608aee9" }
-sprockets-host = { git = "http://github.com/oxidecomputer/sprockets", rev = "77df31efa5619d0767ffc837ef7468101608aee9" }
-sprockets-rot = { git = "http://github.com/oxidecomputer/sprockets", rev = "77df31efa5619d0767ffc837ef7468101608aee9" }
+sprockets-common = { git = "https://github.com/oxidecomputer/sprockets", rev = "77df31efa5619d0767ffc837ef7468101608aee9" }
+sprockets-host = { git = "https://github.com/oxidecomputer/sprockets", rev = "77df31efa5619d0767ffc837ef7468101608aee9" }
+sprockets-rot = { git = "https://github.com/oxidecomputer/sprockets", rev = "77df31efa5619d0767ffc837ef7468101608aee9" }
 sqlformat = "0.2.3"
 sqlparser = { version = "0.45.0", features = [ "visitor" ] }
 static_assertions = "1.1.0"
 # Please do not change the Steno version to a Git dependency.  It makes it
 # harder than expected to make breaking changes (even if you specify a specific
 # SHA).  Cut a new Steno release instead.  See omicron#2117.
-steno = "0.4.0"
+steno = "0.4.1"
 strum = { version = "0.26", features = [ "derive" ] }
 subprocess = "0.2.9"
 supports-color = "3.0.0"
@@ -494,7 +494,7 @@ termios = "0.3"
 textwrap = "0.16.1"
 test-strategy = "0.3.1"
 thiserror = "1.0"
-tofino = { git = "http://github.com/oxidecomputer/tofino", branch = "main" }
+tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
 tokio = "1.37.0"
 tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
 tokio-stream = "0.1.15"

diff --git a/dev-tools/omdb/tests/successes.out b/dev-tools/omdb/tests/successes.out
@@ -403,28 +403,28 @@ task: "dns_propagation_external"
 task: "nat_v4_garbage_collector"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     last completion reported error: failed to resolve addresses for Dendrite services: no record found for Query { name: Name("_dendrite._tcp.control-plane.oxide.internal."), query_type: SRV, query_class: IN }
 
 task: "blueprint_loader"
   configured period: every 1m 40s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     last completion reported error: failed to read target blueprint: Internal Error: no target blueprint set
 
 task: "blueprint_executor"
   configured period: every 10m
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     last completion reported error: no blueprint
 
 task: "abandoned_vmm_reaper"
   configured period: every 1m
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     total abandoned VMMs found: 0
       VMM records deleted: 0
@@ -434,14 +434,14 @@ task: "abandoned_vmm_reaper"
 task: "bfd_manager"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     last completion reported error: failed to resolve addresses for Dendrite services: no record found for Query { name: Name("_dendrite._tcp.control-plane.oxide.internal."), query_type: SRV, query_class: IN }
 
 task: "crdb_node_id_collector"
   configured period: every 10m
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     last completion reported error: no blueprint
 
@@ -465,7 +465,7 @@ task: "external_endpoints"
 task: "instance_watcher"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     total instances checked: 0
     checks completed: 0
@@ -486,14 +486,14 @@ task: "inventory_collection"
 task: "metrics_producer_gc"
   configured period: every 1m
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
 warning: unknown background task: "metrics_producer_gc" (don't know how to interpret details: Object {"expiration": String("<REDACTED           TIMESTAMP>"), "pruned": Array []})
 
 task: "phantom_disks"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     number of phantom disks deleted: 0
     number of phantom disk delete errors: 0
@@ -508,15 +508,15 @@ task: "physical_disk_adoption"
 task: "region_replacement"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     number of region replacements started ok: 0
     number of region replacement start errors: 0
 
 task: "region_replacement_driver"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     number of region replacement drive sagas started ok: 0
     number of region replacement finish sagas started ok: 0
@@ -525,34 +525,34 @@ task: "region_replacement_driver"
 task: "service_firewall_rule_propagation"
   configured period: every 5m
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
 
 task: "service_zone_nat_tracker"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     last completion reported error: inventory collection is None
 
 task: "switch_port_config_manager"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
 warning: unknown background task: "switch_port_config_manager" (don't know how to interpret details: Object {})
 
 task: "v2p_manager"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
 warning: unknown background task: "v2p_manager" (don't know how to interpret details: Object {})
 
 task: "vpc_route_manager"
   configured period: every 30s
   currently executing: no
-  last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
+  last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
 warning: unknown background task: "vpc_route_manager" (don't know how to interpret details: Object {})
 

diff --git a/installinator/src/hardware.rs b/installinator/src/hardware.rs
@@ -31,7 +31,7 @@ impl Hardware {
             })?;
 
         let disks: Vec<RawDisk> =
-            hardware.disks().into_iter().map(|disk| disk.into()).collect();
+            hardware.disks().into_values().map(|disk| disk.into()).collect();
 
         info!(
             log, "found gimlet hardware";

diff --git a/nexus/auth/src/authz/mod.rs b/nexus/auth/src/authz/mod.rs
@@ -106,7 +106,7 @@
 //! | | | +---------------+-----------+-------------+-------------+---+      |
 //! | | | | resource_type | role_name | resource_id | identity_id |...|      |
 //! | | | +---------------+-----------+-------------+-------------+---+      |
-//! | | | | "project "    | "viewer"  |         234 |          123|...|      |
+//! | | | | "project "    | "viewer"  |         123 |         234 |...|      |
 //! | | | +--^------------+--^--------+----------^--+-----------^-+---+      |
 //! | | |    |               |                   |              |            |
 //! +-|-|----+               |                   |              +------------+